1 files changed, 73 insertions, 1 deletions
diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index e86951f317f..4c76cbb7588 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -1152,6 +1152,30 @@ create table t2 select sql_big_result f1,count(f2) from t1 group by f1;
 show status like 'handler_read%';
 drop table t1,t2;
 
+#
+# Bug #25162: Backing up DB from 5.1 adds 'USING BTREE' to KEYs on table creates
+#
+
+# Show that the old syntax for index type is supported
+CREATE TABLE t1(c1 VARCHAR(33), KEY USING BTREE (c1));
+DROP TABLE t1;
+
+# Show that the new syntax for index type is supported
+CREATE TABLE t1(c1 VARCHAR(33), KEY (c1) USING BTREE);
+DROP TABLE t1;
+
+# Show that in case of multiple index type definitions, the last one takes 
+# precedence
+
+CREATE TABLE t1(c1 VARCHAR(33), KEY USING BTREE (c1) USING HASH) ENGINE=MEMORY;
+SHOW INDEX FROM t1;
+DROP TABLE t1;
+
+CREATE TABLE t1(c1 VARCHAR(33), KEY USING HASH (c1) USING BTREE) ENGINE=MEMORY;
+SHOW INDEX FROM t1;
+DROP TABLE t1;
+
+
 --echo End of 5.0 tests
 
 #
@@ -1341,6 +1365,8 @@ create table t1 like information_schema.character_sets;
 show create table t1;
 drop table t1;
 
+###########################################################################
+
 --echo
 --echo # --
 --echo # -- Bug#21380: DEFAULT definition not always transfered by CREATE
@@ -1384,8 +1410,10 @@ DROP TABLE t1;
 
 --echo
 --echo # -- End of test case for Bug#21380.
---echo
 
+###########################################################################
+
+--echo
 --echo # --
 --echo # -- Bug#18834: ALTER TABLE ADD INDEX on table with two timestamp fields
 --echo # --
@@ -1448,6 +1476,50 @@ DROP TABLE t3;
 
 --echo
 --echo # -- End of Bug#18834.
+
+###########################################################################
+
 --echo
+--echo # --
+--echo # -- Bug#34274: Invalid handling of 'DEFAULT 0' for YEAR data type.
+--echo # --
+--echo
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
 
+--echo
+CREATE TABLE t1(c1 YEAR DEFAULT 2008, c2 YEAR DEFAULT 0);
+
+--echo
+SHOW CREATE TABLE t1;
+
+--echo
+INSERT INTO t1 VALUES();
+
+--echo
+SELECT * FROM t1;
+
+--echo
+ALTER TABLE t1 MODIFY c1 YEAR DEFAULT 0;
+
+--echo
+SHOW CREATE TABLE t1;
+
+--echo
+INSERT INTO t1 VALUES();
+
+--echo
+SELECT * FROM t1;
+
+--echo
+DROP TABLE t1;
+
+--echo
+--echo # -- End of Bug#34274
+
+###########################################################################
+
+--echo
 --echo End of 5.1 tests