bzr push into mysql-trunk branch (gleb.shchepa:3906 to 3907)

[Gleb Shchepa]

 3907 Gleb Shchepa	2012-06-26 [merge]
      manual merge (backport of WL6219)

    modified:
      mysql-test/r/type_year.result
      mysql-test/t/type_year.test
 3906 kevin.lewis@stripped	2012-06-26
      Clean up test cases that use information_schema tables
      to display InnoDB tablespaces and datafiles so that they
      are have a deterministic output.

    modified:
      mysql-test/suite/innodb/r/innodb-restart.result
      mysql-test/suite/innodb/r/innodb-system-table-view.result
      mysql-test/suite/innodb/r/innodb-wl5980-discard.result
      mysql-test/suite/innodb/t/innodb-restart.test
      mysql-test/suite/innodb/t/innodb-system-table-view.test
      mysql-test/suite/innodb/t/innodb-wl5980-discard.test
=== modified file 'mysql-test/r/type_year.result'
--- a/mysql-test/r/type_year.result	2012-05-24 22:21:16 +0000
+++ b/mysql-test/r/type_year.result	2012-06-26 18:12:47 +0000
@@ -354,6 +354,16 @@ total_rows	min_value	MAX(c1)
 3	0	2155
 DROP TABLE t1;
 #
+# WL#6219: Deprecate and remove YEAR(2) type
+#
+CREATE TABLE t1 (c1 YEAR(2), c2 YEAR(4));
+Warnings:
+Warning	1818	YEAR(2) column type is deprecated. Creating YEAR(4) column instead.
+ALTER TABLE t1 MODIFY COLUMN c2 YEAR(2);
+Warnings:
+Warning	1818	YEAR(2) column type is deprecated. Creating YEAR(4) column instead.
+DROP TABLE t1;
+#
 End of 5.1 tests
 #
 # Start of 5.6 tests

=== modified file 'mysql-test/t/type_year.test'
--- a/mysql-test/t/type_year.test	2011-11-01 11:52:24 +0000
+++ b/mysql-test/t/type_year.test	2012-06-26 18:12:47 +0000
@@ -160,6 +160,14 @@ SELECT COUNT(*) AS total_rows, MIN(c1) A
 DROP TABLE t1;
 
 --echo #
+--echo # WL#6219: Deprecate and remove YEAR(2) type
+--echo #
+
+CREATE TABLE t1 (c1 YEAR(2), c2 YEAR(4));
+ALTER TABLE t1 MODIFY COLUMN c2 YEAR(2);
+DROP TABLE t1;
+
+--echo #
 
 --echo End of 5.1 tests
 

No bundle (reason: useless for push emails).