Use 'USING <indextype>' in results of SHOW CREATE TABLE, it's the preferred

syntax. (Bug #7233)

4 files changed, 9 insertions, 9 deletions

diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/r/ctype_utf8.result
index 599d49208e7..41e2c13a4b5 100644
--- a/mysql-test/r/ctype_utf8.result
+++ b/mysql-test/r/ctype_utf8.result
@@ -448,7 +448,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c` char(10) character set utf8 default NULL,
-  UNIQUE KEY `a` TYPE BTREE (`c`(1))
+  UNIQUE KEY `a` USING BTREE (`c`(1))
 ) ENGINE=HEAP DEFAULT CHARSET=latin1
 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
 insert into t1 values ('aa');
@@ -606,7 +606,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c` char(10) character set utf8 collate utf8_bin default NULL,
-  UNIQUE KEY `a` TYPE BTREE (`c`(1))
+  UNIQUE KEY `a` USING BTREE (`c`(1))
 ) ENGINE=HEAP DEFAULT CHARSET=latin1
 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
 insert into t1 values ('aa');
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index 0afe45eb5e5..7d214e2da05 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -297,7 +297,7 @@ select @@max_heap_table_size;
 1047552
 CREATE TABLE t1 (
 a int(11) default NULL,
-KEY a TYPE BTREE (a)
+KEY a USING BTREE (a)
 ) ENGINE=HEAP;
 CREATE TABLE t2 (
 b int(11) default NULL,
@@ -306,7 +306,7 @@ index(b)
 CREATE TABLE t3 (
 a int(11) default NULL,
 b int(11) default NULL,
-KEY a TYPE BTREE (a),
+KEY a USING BTREE (a),
 index(b)
 ) ENGINE=HEAP;
 insert into t1 values (1),(2);
diff --git a/mysql-test/r/sql_mode.result b/mysql-test/r/sql_mode.result
index c18be2df403..e0bbc0f2148 100644
--- a/mysql-test/r/sql_mode.result
+++ b/mysql-test/r/sql_mode.result
@@ -17,7 +17,7 @@ t1	CREATE TABLE `t1` (
   `pseudo` varchar(35) character set latin2 NOT NULL default '',
   `email` varchar(60) character set latin2 NOT NULL default '',
   PRIMARY KEY  (`a`),
-  UNIQUE KEY `email` TYPE BTREE (`email`)
+  UNIQUE KEY `email` USING BTREE (`email`)
 ) ENGINE=HEAP DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
 set @@sql_mode="ansi_quotes";
 show variables like 'sql_mode';
@@ -30,7 +30,7 @@ t1	CREATE TABLE "t1" (
   "pseudo" varchar(35) character set latin2 NOT NULL default '',
   "email" varchar(60) character set latin2 NOT NULL default '',
   PRIMARY KEY  ("a"),
-  UNIQUE KEY "email" TYPE BTREE ("email")
+  UNIQUE KEY "email" USING BTREE ("email")
 ) ENGINE=HEAP DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
 set @@sql_mode="no_table_options";
 show variables like 'sql_mode';
@@ -43,7 +43,7 @@ t1	CREATE TABLE `t1` (
   `pseudo` varchar(35) character set latin2 NOT NULL default '',
   `email` varchar(60) character set latin2 NOT NULL default '',
   PRIMARY KEY  (`a`),
-  UNIQUE KEY `email` TYPE BTREE (`email`)
+  UNIQUE KEY `email` USING BTREE (`email`)
 )
 set @@sql_mode="no_key_options";
 show variables like 'sql_mode';
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
index 7788215dd27..3bbfe862361 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -210,7 +210,7 @@ select @@max_heap_table_size;
 
 CREATE TABLE t1 (
  a int(11) default NULL,
- KEY a TYPE BTREE (a)
+ KEY a USING BTREE (a)
 ) ENGINE=HEAP;
 
 CREATE TABLE t2 (
@@ -221,7 +221,7 @@ CREATE TABLE t2 (
 CREATE TABLE t3 (
  a int(11) default NULL,
  b int(11) default NULL,
- KEY a TYPE BTREE (a),
+ KEY a USING BTREE (a),
  index(b)
 ) ENGINE=HEAP;