bzr push into mysql-trunk branch (gleb.shchepa:3903 to 3904) WL#6129

[Gleb Shchepa]

 3904 Gleb Shchepa	2012-05-29
      Minor test update for WL#6129 "Deprecate and remove YEAR(2)"

    modified:
      mysql-test/suite/funcs_1/r/myisam_views-big.result
 3903 Tor Didriksen	2012-05-29 [merge]
      merge 5.5 => trunk

    modified:
      sql/CMakeLists.txt
=== modified file 'mysql-test/suite/funcs_1/r/myisam_views-big.result'
--- a/mysql-test/suite/funcs_1/r/myisam_views-big.result	2012-03-06 14:29:42 +0000
+++ b/mysql-test/suite/funcs_1/r/myisam_views-big.result	2012-05-29 09:19:02 +0000
@@ -62,6 +62,8 @@ f115 VARBINARY(27) null ,
 f116 VARBINARY(64) null,
 f117 VARBINARY(192) null
 ) engine = myisam;
+Warnings:
+Warning	1818	YEAR(3) column type is deprecated. Creating YEAR(4) column instead.
 load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/myisam_tb2.txt'
 into table tb2;
 DROP DATABASE IF EXISTS test1;
@@ -129,6 +131,8 @@ f115 VARBINARY(27) null ,
 f116 VARBINARY(64) null,
 f117 VARBINARY(192) null
 ) engine = myisam;
+Warnings:
+Warning	1818	YEAR(3) column type is deprecated. Creating YEAR(4) column instead.
 load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/myisam_tb2.txt'
 into table tb2;
 USE test;

No bundle (reason: useless for push emails).