diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/r/ctype_utf8.result index 79bca741fba..784285aaa4b 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/heap.result b/mysql-test/r/heap.result index bcdb24668bb..50f6d3d56fc 100644 --- a/mysql-test/r/heap.result +++ b/mysql-test/r/heap.result @@ -556,9 +556,9 @@ t1 CREATE TABLE `t1` ( `v` varchar(10) default NULL, `c` char(10) default NULL, `t` varchar(50) default NULL, - KEY `v` TYPE BTREE (`v`), - KEY `c` TYPE BTREE (`c`), - KEY `t` TYPE BTREE (`t`(10)) + KEY `v` USING BTREE (`v`), + KEY `c` USING BTREE (`c`), + KEY `t` USING BTREE (`t`(10)) ) ENGINE=HEAP DEFAULT CHARSET=latin1 select count(*) from t1; count(*) diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index aa2f83ee2b8..6efb1c4b995 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -298,7 +298,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, @@ -307,7 +307,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 fea99086303..e01355816c3 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 ae58e2fa5e4..6aafbed6b97 100644 --- a/mysql-test/t/show_check.test +++ b/mysql-test/t/show_check.test @@ -219,7 +219,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 ( @@ -230,7 +230,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; diff --git a/sql/set_var.cc b/sql/set_var.cc index d710be2bb2e..13e3d375448 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -745,11 +745,11 @@ struct show_var_st init_vars[]= { {"innodb_fast_shutdown", (char*) &innobase_fast_shutdown, SHOW_MY_BOOL}, {"innodb_file_io_threads", (char*) &innobase_file_io_threads, SHOW_LONG }, {"innodb_file_per_table", (char*) &innobase_file_per_table, SHOW_MY_BOOL}, - {"innodb_locks_unsafe_for_binlog", (char*) &innobase_locks_unsafe_for_binlog, SHOW_MY_BOOL}, {"innodb_flush_log_at_trx_commit", (char*) &innobase_flush_log_at_trx_commit, SHOW_INT}, {"innodb_flush_method", (char*) &innobase_unix_file_flush_method, SHOW_CHAR_PTR}, {"innodb_force_recovery", (char*) &innobase_force_recovery, SHOW_LONG }, {"innodb_lock_wait_timeout", (char*) &innobase_lock_wait_timeout, SHOW_LONG }, + {"innodb_locks_unsafe_for_binlog", (char*) &innobase_locks_unsafe_for_binlog, SHOW_MY_BOOL}, {"innodb_log_arch_dir", (char*) &innobase_log_arch_dir, SHOW_CHAR_PTR}, {"innodb_log_archive", (char*) &innobase_log_archive, SHOW_MY_BOOL}, {"innodb_log_buffer_size", (char*) &innobase_log_buffer_size, SHOW_LONG }, @@ -758,10 +758,9 @@ struct show_var_st init_vars[]= { {"innodb_log_group_home_dir", (char*) &innobase_log_group_home_dir, SHOW_CHAR_PTR}, {sys_innodb_max_dirty_pages_pct.name, (char*) &sys_innodb_max_dirty_pages_pct, SHOW_SYS}, {sys_innodb_max_purge_lag.name, (char*) &sys_innodb_max_purge_lag, SHOW_SYS}, - {sys_innodb_table_locks.name, (char*) &sys_innodb_table_locks, SHOW_SYS}, - {sys_innodb_max_purge_lag.name, (char*) &sys_innodb_max_purge_lag, SHOW_SYS}, {"innodb_mirrored_log_groups", (char*) &innobase_mirrored_log_groups, SHOW_LONG}, {"innodb_open_files", (char*) &innobase_open_files, SHOW_LONG }, + {sys_innodb_table_locks.name, (char*) &sys_innodb_table_locks, SHOW_SYS}, {"innodb_thread_concurrency", (char*) &innobase_thread_concurrency, SHOW_LONG }, #endif {sys_interactive_timeout.name,(char*) &sys_interactive_timeout, SHOW_SYS}, diff --git a/sql/sql_select.cc b/sql/sql_select.cc index a44628d66a9..b9c8f6c1237 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -7904,7 +7904,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List &fields, table->s->keys_for_keyread.init(); table->s->keys_in_use.init(); /* For easier error reporting */ - table->s->table_cache_key= (char*) table->s->db= ""; + table->s->table_cache_key= (char*) (table->s->db= ""); /* Calculate which type of fields we will store in the temporary table */ diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 1e284891b90..3aa39e87614 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -889,12 +889,12 @@ store_create_info(THD *thd, TABLE_LIST *table_list, String *packet) { if (share->db_type == DB_TYPE_HEAP && key_info->algorithm == HA_KEY_ALG_BTREE) - packet->append(" TYPE BTREE", 11); + packet->append(" USING BTREE", 12); // +BAR: send USING only in non-default case: non-spatial rtree if ((key_info->algorithm == HA_KEY_ALG_RTREE) && !(key_info->flags & HA_SPATIAL)) - packet->append(" TYPE RTREE", 11); + packet->append(" USING RTREE", 12); } packet->append(" (", 2);