diff options
| author | unknown <kaa@kaamos.(none)> | 2008-02-17 14:57:01 +0300 |
|---|---|---|
| committer | unknown <kaa@kaamos.(none)> | 2008-02-17 14:57:01 +0300 |
| commit | 695865fee9566bc026858214e8717a8155505a5a (patch) | |
| tree | 32ec9a2109f5937fa7bbd8c249cb71d6546ed347 /mysql-test/t/create.test | |
| parent | 410e2d64d14fc2ea5193fc0111142aca182ed348 (diff) | |
| parent | d740f5c67567479149d2aea524b2463748f3b7ac (diff) | |
| download | mariadb-git-695865fee9566bc026858214e8717a8155505a5a.tar.gz | |
Merge kaamos.(none):/data/src/mysql-5.1
into kaamos.(none):/data/src/opt/mysql-5.1-opt
libmysqld/lib_sql.cc:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
BitKeeper/deleted/.del-rpl_ndb_charset.result:
Auto merged
BitKeeper/deleted/.del-rpl_row_charset.result:
Auto merged
BitKeeper/deleted/.del-rpl_row_charset.test:
Auto merged
BitKeeper/deleted/.del-rpl_row_charset_innodb.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/field.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/lib/mtr_report.pl:
Manual merge.
mysql-test/r/sp.result:
Manual merge.
Diffstat (limited to 'mysql-test/t/create.test')
| -rw-r--r-- | mysql-test/t/create.test | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test index 09170cbc4f5..5775adce34b 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 # |