diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2020-01-13 21:07:04 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2020-02-13 13:42:01 +0200 |
| commit | 45bc7574fba26f3f975379b73d80235081c4d397 (patch) | |
| tree | 0cb57bc82a6e908c4c40f4ac913ae752de6c1d2f /mysql-test/main | |
| parent | 415797f1a67d5281c4e585ac3dc82b10e5dcbd16 (diff) | |
| download | mariadb-git-45bc7574fba26f3f975379b73d80235081c4d397.tar.gz | |
MDEV-18650: Options deprecated in previous versions - storage_engine
Remove usage of deprecated variable storage_engine. It was deprecated in 5.5 but
it never issued a deprecation warning. Make it issue a warning in 10.5.1.
Replaced with default_storage_engine.
Diffstat (limited to 'mysql-test/main')
101 files changed, 507 insertions, 507 deletions
diff --git a/mysql-test/main/alter_table_mdev539_maria.result b/mysql-test/main/alter_table_mdev539_maria.result index 0206f4070a0..01b2982edce 100644 --- a/mysql-test/main/alter_table_mdev539_maria.result +++ b/mysql-test/main/alter_table_mdev539_maria.result @@ -1,5 +1,5 @@ # -set @@storage_engine= Aria; +set @@default_storage_engine= Aria; # # mdev-539: fast build of unique/primary indexes for MyISAM/Aria # @@ -250,4 +250,4 @@ select * from customer where c_custkey=3; c_custkey c_name c_address c_nationkey c_phone c_acctbal c_mktsegment c_comment 3 Customer#000000003 MG9kdTD2WBHm 1 11-719-748-3364 7498.12 AUTOMOBILE special packages wake. slyly reg DROP DATABASE dbt3_s001; -set @@storage_engine= default; +set @@default_storage_engine= default; diff --git a/mysql-test/main/alter_table_mdev539_maria.test b/mysql-test/main/alter_table_mdev539_maria.test index 7e01bc3be84..2fead7bdab4 100644 --- a/mysql-test/main/alter_table_mdev539_maria.test +++ b/mysql-test/main/alter_table_mdev539_maria.test @@ -1,7 +1,7 @@ --echo # -set @@storage_engine= Aria; +set @@default_storage_engine= Aria; --source include/alter_table_mdev539.inc -set @@storage_engine= default; +set @@default_storage_engine= default; diff --git a/mysql-test/main/alter_table_mdev539_myisam.result b/mysql-test/main/alter_table_mdev539_myisam.result index 0339a64c9c7..490e5a4073a 100644 --- a/mysql-test/main/alter_table_mdev539_myisam.result +++ b/mysql-test/main/alter_table_mdev539_myisam.result @@ -1,5 +1,5 @@ # -set @@storage_engine= MyISAM; +set @@default_storage_engine= MyISAM; # # mdev-539: fast build of unique/primary indexes for MyISAM/Aria # @@ -250,4 +250,4 @@ select * from customer where c_custkey=3; c_custkey c_name c_address c_nationkey c_phone c_acctbal c_mktsegment c_comment 3 Customer#000000003 MG9kdTD2WBHm 1 11-719-748-3364 7498.12 AUTOMOBILE special packages wake. slyly reg DROP DATABASE dbt3_s001; -set @@storage_engine= default; +set @@default_storage_engine= default; diff --git a/mysql-test/main/alter_table_mdev539_myisam.test b/mysql-test/main/alter_table_mdev539_myisam.test index 0a5669088bf..c600e37c52c 100644 --- a/mysql-test/main/alter_table_mdev539_myisam.test +++ b/mysql-test/main/alter_table_mdev539_myisam.test @@ -1,7 +1,7 @@ --echo # -set @@storage_engine= MyISAM; +set @@default_storage_engine= MyISAM; --source include/alter_table_mdev539.inc -set @@storage_engine= default; +set @@default_storage_engine= default; diff --git a/mysql-test/main/cache_innodb.result b/mysql-test/main/cache_innodb.result index 18ae0ac8a83..d6e67b472b0 100644 --- a/mysql-test/main/cache_innodb.result +++ b/mysql-test/main/cache_innodb.result @@ -1,6 +1,6 @@ SET global query_cache_type=ON; SET local query_cache_type=ON; -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; drop table if exists t1,t2,t3; set @save_query_cache_size = @@global.query_cache_size; set GLOBAL query_cache_size = 1355776; @@ -132,7 +132,7 @@ id a 1 me drop table t3,t2,t1; connect connection1,localhost,root,,; -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; SET @@autocommit=1; connection default; SHOW VARIABLES LIKE 'have_query_cache'; @@ -141,7 +141,7 @@ have_query_cache YES SET GLOBAL query_cache_size = 204800; flush status; SET @@autocommit=1; -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; CREATE TABLE t2 (s1 int, s2 varchar(1000), key(s1)); INSERT INTO t2 VALUES (1,repeat('a',10)),(2,repeat('a',10)),(3,repeat('a',10)),(4,repeat('a',10)); COMMIT; diff --git a/mysql-test/main/comment_column.test b/mysql-test/main/comment_column.test index a4f3893dd4a..e883f64766a 100644 --- a/mysql-test/main/comment_column.test +++ b/mysql-test/main/comment_column.test @@ -6,7 +6,7 @@ create table t1 (c1 VARCHAR(10) NOT NULL COMMENT 'Abcdefghijabcdefghijabcdefghij SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; @@ -14,7 +14,7 @@ ALTER TABLE t1 ADD COLUMN c8 INTEGER COMMENT 'ABCdefghijabcdefghijabcdefghijabcd SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; @@ -23,7 +23,7 @@ ALTER TABLE t1 ADD COLUMN c9 INTEGER COMMENT 'ABCDefghijabcdefghijabcdefghijabcd SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; @@ -32,7 +32,7 @@ ALTER TABLE t1 ADD COLUMN c10 INTEGER COMMENT 'ABCDEfghijabcdefghijabcdefghijabc SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; @@ -41,14 +41,14 @@ ALTER TABLE t1 MODIFY COLUMN c8 CHAR(10); SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; ALTER TABLE t1 CHANGE COLUMN c9 c9_1 INTEGER COMMENT '1234567890'; SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; @@ -56,7 +56,7 @@ ALTER TABLE t1 DROP COLUMN c1; SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; @@ -67,7 +67,7 @@ ALTER TABLE t1 ADD COLUMN c11 INTEGER COMMENT 'ABCDEfghijabcdefghijabcdefghijabc SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; @@ -78,7 +78,7 @@ ALTER TABLE t1 ADD COLUMN c12 INTEGER COMMENT 'ABCDEfghijabcdefghijabcdefghijabc SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; @@ -87,7 +87,7 @@ ALTER TABLE t1 ADD COLUMN c12 CHAR(100) COMMENT 'ABCDefghijabcdefghijabcdefghija SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; @@ -99,7 +99,7 @@ create table t1 (c1 VARCHAR(10) NOT NULL COMMENT 'Abcdefghijabcdefghijabcdefghij SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; diff --git a/mysql-test/main/comment_index.test b/mysql-test/main/comment_index.test index 4ba1f336ddb..5db60368dac 100644 --- a/mysql-test/main/comment_index.test +++ b/mysql-test/main/comment_index.test @@ -6,7 +6,7 @@ create table t1 (c1 VARCHAR(10) NOT NULL COMMENT 'Abcdefghijabcdefghijabcdefghij SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; @@ -15,7 +15,7 @@ CREATE INDEX i4 ON t1(c4) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcde SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; @@ -24,7 +24,7 @@ ALTER TABLE t1 ADD INDEX (c6) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghija SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; @@ -33,7 +33,7 @@ ALTER TABLE t1 DROP INDEX i2, DROP INDEX i4; SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; @@ -41,7 +41,7 @@ ALTER TABLE t1 ADD INDEX i8(c8) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghi SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; @@ -51,7 +51,7 @@ CREATE INDEX i1_3 ON t1(c1,c2,c3) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefg SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; @@ -62,7 +62,7 @@ CREATE INDEX i11 ON t1(c11) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabc SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; @@ -71,7 +71,7 @@ ALTER TABLE t1 ADD INDEX (c13) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghij SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; @@ -84,7 +84,7 @@ ALTER TABLE t1 ADD INDEX i12 (c12) COMMENT 'abcdefghijabcdefghijabcdefghijabcdef SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; @@ -95,7 +95,7 @@ CREATE INDEX i12 ON t1(c12) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabc SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; diff --git a/mysql-test/main/comment_table.test b/mysql-test/main/comment_table.test index 2a85fbac571..6ab9f23b377 100644 --- a/mysql-test/main/comment_table.test +++ b/mysql-test/main/comment_table.test @@ -6,7 +6,7 @@ create table t1 (c1 VARCHAR(10) NOT NULL COMMENT 'c1 comment', c2 INTEGER,c3 INT ) COMMENT='abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'; SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; drop table t1; @@ -16,7 +16,7 @@ create table t1 (c1 VARCHAR(10) NOT NULL COMMENT 'c1 comment', c2 INTEGER,c3 INT ) COMMENT='abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcde'; SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; drop table t1; @@ -33,7 +33,7 @@ create table t1 (c1 VARCHAR(10) NOT NULL COMMENT 'c1 comment', c2 INTEGER,c3 INT ) COMMENT='abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'; SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; -let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='STORAGE_ENGINE'`; +let $ENGINE=`select variable_value from information_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`; --replace_result $ENGINE ENGINE SHOW CREATE TABLE t1; drop table t1; diff --git a/mysql-test/main/concurrent_innodb_safelog.result b/mysql-test/main/concurrent_innodb_safelog.result index ed399b4f1a1..7d120547570 100644 --- a/mysql-test/main/concurrent_innodb_safelog.result +++ b/mysql-test/main/concurrent_innodb_safelog.result @@ -15,7 +15,7 @@ GRANT USAGE ON test.* TO mysqltest@localhost; connect thread1, localhost, mysqltest,,; connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1(eta int(11) not null, tipo int(11), c varchar(255)); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); @@ -155,7 +155,7 @@ drop table t1; ** connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1(eta int(11) not null, tipo int(11), c varchar(255)); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); @@ -293,7 +293,7 @@ drop table t1; ** connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1 (a int not null, b int not null); insert into t1 values (1,1),(2,1),(3,1),(4,1); ** Create ULL 'hello2' @@ -342,7 +342,7 @@ drop table t1; ** connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1(eta int(11) not null, tipo int(11), c varchar(255)); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); @@ -445,7 +445,7 @@ drop table t1; ** connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1(eta int(11) not null, tipo int(11), c varchar(255)); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); @@ -549,7 +549,7 @@ drop table t1; ** connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1(eta int(11) not null, tipo int(11), c varchar(255)); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); @@ -636,7 +636,7 @@ drop table t1; ** connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1(eta int(11) not null, tipo int(11), c varchar(255)); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); @@ -713,7 +713,7 @@ drop table t1; ** connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1(eta int(11) not null, tipo int(11), c varchar(255)); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); diff --git a/mysql-test/main/concurrent_innodb_unsafelog.result b/mysql-test/main/concurrent_innodb_unsafelog.result index 1bf556046b9..9ae80328c0b 100644 --- a/mysql-test/main/concurrent_innodb_unsafelog.result +++ b/mysql-test/main/concurrent_innodb_unsafelog.result @@ -16,7 +16,7 @@ GRANT USAGE ON test.* TO mysqltest@localhost; connect thread1, localhost, mysqltest,,; connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1(eta int(11) not null, tipo int(11), c varchar(255)); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); @@ -155,7 +155,7 @@ drop table t1; ** connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1(eta int(11) not null, tipo int(11), c varchar(255)); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); @@ -292,7 +292,7 @@ drop table t1; ** connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1 (a int not null, b int not null); insert into t1 values (1,1),(2,1),(3,1),(4,1); ** Create ULL 'hello2' @@ -341,7 +341,7 @@ drop table t1; ** connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1(eta int(11) not null, tipo int(11), c varchar(255)); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); @@ -444,7 +444,7 @@ drop table t1; ** connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1(eta int(11) not null, tipo int(11), c varchar(255)); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); @@ -547,7 +547,7 @@ drop table t1; ** connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1(eta int(11) not null, tipo int(11), c varchar(255)); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); @@ -634,7 +634,7 @@ drop table t1; ** connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1(eta int(11) not null, tipo int(11), c varchar(255)); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); @@ -711,7 +711,7 @@ drop table t1; ** connection thread1; ** Set up table -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; create table t1(eta int(11) not null, tipo int(11), c varchar(255)); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); diff --git a/mysql-test/main/create.result b/mysql-test/main/create.result index c1733c270a7..45d4a24ddf8 100644 --- a/mysql-test/main/create.result +++ b/mysql-test/main/create.result @@ -258,9 +258,9 @@ select * from t1; if('2002'='2002','Y','N') Y drop table if exists t1; -SET SESSION storage_engine="heap"; -SELECT @@storage_engine; -@@storage_engine +SET SESSION default_storage_engine="heap"; +SELECT @@default_storage_engine; +@@default_storage_engine MEMORY CREATE TABLE t1 (a int not null); show create table t1; @@ -269,10 +269,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 drop table t1; -SET SESSION storage_engine="gemini"; +SET SESSION default_storage_engine="gemini"; ERROR 42000: Unknown storage engine 'gemini' -SELECT @@storage_engine; -@@storage_engine +SELECT @@default_storage_engine; +@@default_storage_engine MEMORY CREATE TABLE t1 (a int not null); show create table t1; @@ -280,7 +280,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 -SET SESSION storage_engine=default; +SET SESSION default_storage_engine=default; drop table t1; create table t1 ( k1 varchar(2), k2 int, primary key(k1,k2)); insert into t1 values ("a", 1), ("b", 2); @@ -422,9 +422,9 @@ create temporary table t3 like t2; ERROR HY000: Table 't2' was not locked with LOCK TABLES unlock tables; drop tables t1, t2; -SET SESSION storage_engine="heap"; -SELECT @@storage_engine; -@@storage_engine +SET SESSION default_storage_engine="heap"; +SELECT @@default_storage_engine; +@@default_storage_engine MEMORY CREATE TABLE t1 (a int not null); show create table t1; @@ -433,10 +433,10 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 drop table t1; -SET SESSION storage_engine="gemini"; +SET SESSION default_storage_engine="gemini"; ERROR 42000: Unknown storage engine 'gemini' -SELECT @@storage_engine; -@@storage_engine +SELECT @@default_storage_engine; +@@default_storage_engine MEMORY CREATE TABLE t1 (a int not null); show create table t1; @@ -444,7 +444,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 -SET SESSION storage_engine=default; +SET SESSION default_storage_engine=default; drop table t1; create table t1(a int,b int,c int unsigned,d date,e char,f datetime,g time,h blob); insert into t1(a)values(1); diff --git a/mysql-test/main/create.test b/mysql-test/main/create.test index 64aea4ddcf1..3a9d90892c5 100644 --- a/mysql-test/main/create.test +++ b/mysql-test/main/create.test @@ -197,17 +197,17 @@ drop table if exists t1; # # Test default table type # -SET SESSION storage_engine="heap"; -SELECT @@storage_engine; +SET SESSION default_storage_engine="heap"; +SELECT @@default_storage_engine; CREATE TABLE t1 (a int not null); show create table t1; drop table t1; --error 1286 -SET SESSION storage_engine="gemini"; -SELECT @@storage_engine; +SET SESSION default_storage_engine="gemini"; +SELECT @@default_storage_engine; CREATE TABLE t1 (a int not null); show create table t1; -SET SESSION storage_engine=default; +SET SESSION default_storage_engine=default; drop table t1; @@ -355,17 +355,17 @@ drop tables t1, t2; # # Test default table type # -SET SESSION storage_engine="heap"; -SELECT @@storage_engine; +SET SESSION default_storage_engine="heap"; +SELECT @@default_storage_engine; CREATE TABLE t1 (a int not null); show create table t1; drop table t1; --error 1286 -SET SESSION storage_engine="gemini"; -SELECT @@storage_engine; +SET SESSION default_storage_engine="gemini"; +SELECT @@default_storage_engine; CREATE TABLE t1 (a int not null); show create table t1; -SET SESSION storage_engine=default; +SET SESSION default_storage_engine=default; drop table t1; # diff --git a/mysql-test/main/ctype_big5.result b/mysql-test/main/ctype_big5.result index 8895e2d89df..95d1f10349e 100644 --- a/mysql-test/main/ctype_big5.result +++ b/mysql-test/main/ctype_big5.result @@ -4827,7 +4827,7 @@ DROP TABLE t1; # MDEV-9711 NO PAD Collatons # SET character_set_connection=big5; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -4965,7 +4965,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -5103,8 +5103,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -5242,7 +5242,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -5380,7 +5380,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; # # End of 10.2 tests # diff --git a/mysql-test/main/ctype_cp932.result b/mysql-test/main/ctype_cp932.result index eb714e9f8d7..dcb94d95c50 100644 --- a/mysql-test/main/ctype_cp932.result +++ b/mysql-test/main/ctype_cp932.result @@ -40,7 +40,7 @@ SET @@character_set_results= @old_character_set_results; # MDEV-9711 NO PAD Collatons # SET character_set_connection=cp932; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -178,7 +178,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -316,8 +316,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -455,7 +455,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -593,7 +593,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; # # End of 10.2 tests # diff --git a/mysql-test/main/ctype_eucjpms.result b/mysql-test/main/ctype_eucjpms.result index be341cc7e68..1a40490308e 100644 --- a/mysql-test/main/ctype_eucjpms.result +++ b/mysql-test/main/ctype_eucjpms.result @@ -33934,7 +33934,7 @@ DROP TABLE t1; # MDEV-9711 NO PAD Collatons # SET character_set_connection=eucjpms; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -34072,7 +34072,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -34210,8 +34210,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -34349,7 +34349,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -34487,7 +34487,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; # # End of 10.2 tests # diff --git a/mysql-test/main/ctype_euckr.result b/mysql-test/main/ctype_euckr.result index f8dab97ce1d..9f98e39c59e 100644 --- a/mysql-test/main/ctype_euckr.result +++ b/mysql-test/main/ctype_euckr.result @@ -25452,7 +25452,7 @@ SET optimizer_switch=@save_optimizer_switch; # MDEV-9711 NO PAD Collatons # SET character_set_connection=euckr; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -25590,7 +25590,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -25728,8 +25728,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -25867,7 +25867,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -26005,7 +26005,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; # # End of 10.2 tests # diff --git a/mysql-test/main/ctype_gb2312.result b/mysql-test/main/ctype_gb2312.result index 2998615b1cb..49db390cee4 100644 --- a/mysql-test/main/ctype_gb2312.result +++ b/mysql-test/main/ctype_gb2312.result @@ -4522,7 +4522,7 @@ SET sql_mode = DEFAULT; # MDEV-9711 NO PAD Collatons # SET character_set_connection=gb2312; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -4660,7 +4660,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -4798,8 +4798,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -4937,7 +4937,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -5075,7 +5075,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; # # End of 10.2 tests # diff --git a/mysql-test/main/ctype_gbk.result b/mysql-test/main/ctype_gbk.result index c2a84a7ea70..fb66631c5cb 100644 --- a/mysql-test/main/ctype_gbk.result +++ b/mysql-test/main/ctype_gbk.result @@ -5985,7 +5985,7 @@ DROP TABLE t1; # MDEV-9711 NO PAD Collatons # SET character_set_connection=gbk; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -6123,7 +6123,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -6261,8 +6261,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -6400,7 +6400,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -6538,7 +6538,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; # # End of 10.2 tests # diff --git a/mysql-test/main/ctype_latin1.result b/mysql-test/main/ctype_latin1.result index 81dc03d517d..263afe4f584 100644 --- a/mysql-test/main/ctype_latin1.result +++ b/mysql-test/main/ctype_latin1.result @@ -8307,7 +8307,7 @@ CONVERT(1, CHAR) IN ('100', '10', '1') # MDEV-9711 NO PAD Collatons # SET character_set_connection=latin1; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -8445,7 +8445,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -8583,8 +8583,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -8722,7 +8722,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -8860,7 +8860,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET NAMES latin1; # # MDEV-14350 Index use with collation utf8mb4_unicode_nopad_ci on LIKE pattern with wrong results diff --git a/mysql-test/main/ctype_nopad_8bit.result b/mysql-test/main/ctype_nopad_8bit.result index b5dadc2f5da..2b089ce2994 100644 --- a/mysql-test/main/ctype_nopad_8bit.result +++ b/mysql-test/main/ctype_nopad_8bit.result @@ -2,7 +2,7 @@ # MDEV-9711 NO PAD Collatons # SET character_set_connection=dec8; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -140,7 +140,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -278,8 +278,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -417,7 +417,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -555,9 +555,9 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET character_set_connection=cp850; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -695,7 +695,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -833,8 +833,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -972,7 +972,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -1110,9 +1110,9 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET character_set_connection=hp8; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -1250,7 +1250,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -1388,8 +1388,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -1527,7 +1527,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -1665,9 +1665,9 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET character_set_connection=koi8r; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -1805,7 +1805,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -1943,8 +1943,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -2082,7 +2082,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -2220,9 +2220,9 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET character_set_connection=latin2; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -2360,7 +2360,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -2498,8 +2498,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -2637,7 +2637,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -2775,9 +2775,9 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET character_set_connection=swe7; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -2915,7 +2915,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -3053,8 +3053,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -3192,7 +3192,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -3330,9 +3330,9 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET character_set_connection=ascii; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -3470,7 +3470,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -3608,8 +3608,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -3747,7 +3747,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -3885,9 +3885,9 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET character_set_connection=hebrew; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -4025,7 +4025,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -4163,8 +4163,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -4302,7 +4302,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -4440,9 +4440,9 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET character_set_connection=koi8u; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -4580,7 +4580,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -4718,8 +4718,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -4857,7 +4857,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -4995,9 +4995,9 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET character_set_connection=greek; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -5135,7 +5135,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -5273,8 +5273,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -5412,7 +5412,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -5550,9 +5550,9 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET character_set_connection=cp1250; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -5690,7 +5690,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -5828,8 +5828,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -5967,7 +5967,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -6105,9 +6105,9 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET character_set_connection=cp1257; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -6245,7 +6245,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -6383,8 +6383,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -6522,7 +6522,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -6660,9 +6660,9 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET character_set_connection=latin5; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -6800,7 +6800,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -6938,8 +6938,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -7077,7 +7077,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -7215,9 +7215,9 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET character_set_connection=armscii8; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -7355,7 +7355,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -7493,8 +7493,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -7632,7 +7632,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -7770,9 +7770,9 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET character_set_connection=cp866; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -7910,7 +7910,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -8048,8 +8048,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -8187,7 +8187,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -8325,9 +8325,9 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET character_set_connection=keybcs2; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -8465,7 +8465,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -8603,8 +8603,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -8742,7 +8742,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -8880,9 +8880,9 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET character_set_connection=macce; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -9020,7 +9020,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -9158,8 +9158,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -9297,7 +9297,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -9435,9 +9435,9 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET character_set_connection=macroman; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -9575,7 +9575,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -9713,8 +9713,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -9852,7 +9852,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -9990,9 +9990,9 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET character_set_connection=cp852; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -10130,7 +10130,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -10268,8 +10268,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -10407,7 +10407,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -10545,9 +10545,9 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET character_set_connection=latin7; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -10685,7 +10685,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -10823,8 +10823,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -10962,7 +10962,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -11100,9 +11100,9 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET character_set_connection=cp1251; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -11240,7 +11240,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -11378,8 +11378,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -11517,7 +11517,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -11655,9 +11655,9 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET character_set_connection=cp1256; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -11795,7 +11795,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -11933,8 +11933,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -12072,7 +12072,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -12210,9 +12210,9 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET character_set_connection=geostd8; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -12350,7 +12350,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -12488,8 +12488,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -12627,7 +12627,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -12765,7 +12765,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; # # End of 10.2 tests # diff --git a/mysql-test/main/ctype_sjis.result b/mysql-test/main/ctype_sjis.result index c897268b204..4917a1973a1 100644 --- a/mysql-test/main/ctype_sjis.result +++ b/mysql-test/main/ctype_sjis.result @@ -18739,7 +18739,7 @@ DROP TABLE t1; # MDEV-9711 NO PAD Collatons # SET character_set_connection=sjis; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -18877,7 +18877,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -19015,8 +19015,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -19154,7 +19154,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -19292,7 +19292,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; # # End of 10.2 tests # diff --git a/mysql-test/main/ctype_swe7.result b/mysql-test/main/ctype_swe7.result index 63da7d362ca..e1913fa5dcd 100644 --- a/mysql-test/main/ctype_swe7.result +++ b/mysql-test/main/ctype_swe7.result @@ -3078,7 +3078,7 @@ SET sql_mode = DEFAULT; # MDEV-9711 NO PAD Collatons # SET character_set_connection=swe7; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -3216,7 +3216,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -3354,8 +3354,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -3493,7 +3493,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -3631,7 +3631,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; # # End of 10.2 tests # diff --git a/mysql-test/main/ctype_tis620.result b/mysql-test/main/ctype_tis620.result index 9650c366d38..7e0c255c756 100644 --- a/mysql-test/main/ctype_tis620.result +++ b/mysql-test/main/ctype_tis620.result @@ -3866,7 +3866,7 @@ E0 # MDEV-9711 NO PAD Collatons # SET character_set_connection=tis620; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -4004,7 +4004,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -4142,8 +4142,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -4281,7 +4281,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -4419,7 +4419,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; # # End of 10.2 tests # diff --git a/mysql-test/main/ctype_ucs.result b/mysql-test/main/ctype_ucs.result index 6f15309211b..4688df046c9 100644 --- a/mysql-test/main/ctype_ucs.result +++ b/mysql-test/main/ctype_ucs.result @@ -5775,7 +5775,7 @@ Warning 1292 Truncated incorrect INTEGER value: '1IJ3' # MDEV-9711 NO PAD Collatons # SET character_set_connection=ucs2; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -5913,7 +5913,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -6051,8 +6051,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -6190,7 +6190,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -6328,7 +6328,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; # # MDEV-10585 EXECUTE IMMEDIATE statement # diff --git a/mysql-test/main/ctype_ucs2_uca.result b/mysql-test/main/ctype_ucs2_uca.result index 44a623842c6..24667ff6949 100644 --- a/mysql-test/main/ctype_ucs2_uca.result +++ b/mysql-test/main/ctype_ucs2_uca.result @@ -5,7 +5,7 @@ # MDEV-10877 xxx_unicode_nopad_ci collations # SET NAMES utf8, character_set_connection=ucs2; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -143,7 +143,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -281,8 +281,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -420,7 +420,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -558,7 +558,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET NAMES utf8, collation_connection=ucs2_unicode_520_nopad_ci; # # MDEV-14350 Index use with collation utf8mb4_unicode_nopad_ci on LIKE pattern with wrong results diff --git a/mysql-test/main/ctype_ujis.result b/mysql-test/main/ctype_ujis.result index 66175344615..c20455813d3 100644 --- a/mysql-test/main/ctype_ujis.result +++ b/mysql-test/main/ctype_ujis.result @@ -26253,7 +26253,7 @@ DROP TABLE t1; # MDEV-9711 NO PAD Collatons # SET character_set_connection=ujis; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -26391,7 +26391,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -26529,8 +26529,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -26668,7 +26668,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -26806,7 +26806,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; # # End of 10.2 tests # diff --git a/mysql-test/main/ctype_utf16.result b/mysql-test/main/ctype_utf16.result index c3af1eaf549..94ad141313d 100644 --- a/mysql-test/main/ctype_utf16.result +++ b/mysql-test/main/ctype_utf16.result @@ -2257,7 +2257,7 @@ Warning 1292 Truncated incorrect INTEGER value: '1IJ3' # MDEV-9711 NO PAD Collatons # SET character_set_connection=utf16; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -2395,7 +2395,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -2533,8 +2533,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -2672,7 +2672,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -2810,7 +2810,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; # # End of 10.2 tests # diff --git a/mysql-test/main/ctype_utf16_uca.result b/mysql-test/main/ctype_utf16_uca.result index 72058ba37fe..1b5224e2179 100644 --- a/mysql-test/main/ctype_utf16_uca.result +++ b/mysql-test/main/ctype_utf16_uca.result @@ -7318,7 +7318,7 @@ DROP TABLE t1; # MDEV-10877 xxx_unicode_nopad_ci collations # SET NAMES utf8, character_set_connection=utf16; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -7456,7 +7456,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -7594,8 +7594,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -7733,7 +7733,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -7871,7 +7871,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET NAMES utf8, collation_connection=utf16_unicode_520_nopad_ci; # # MDEV-14350 Index use with collation utf8mb4_unicode_nopad_ci on LIKE pattern with wrong results diff --git a/mysql-test/main/ctype_utf16le.result b/mysql-test/main/ctype_utf16le.result index dbb743c7ec3..3e4f2faf453 100644 --- a/mysql-test/main/ctype_utf16le.result +++ b/mysql-test/main/ctype_utf16le.result @@ -2443,7 +2443,7 @@ Warning 1292 Truncated incorrect INTEGER value: '1IJ3' # MDEV-9711 NO PAD Collatons # SET character_set_connection=utf16le; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -2581,7 +2581,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -2719,8 +2719,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -2858,7 +2858,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -2996,7 +2996,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; # # End of 10.2 tests # diff --git a/mysql-test/main/ctype_utf32.result b/mysql-test/main/ctype_utf32.result index c4e1e8beeeb..f98eedc2464 100644 --- a/mysql-test/main/ctype_utf32.result +++ b/mysql-test/main/ctype_utf32.result @@ -2313,7 +2313,7 @@ Warning 1292 Truncated incorrect INTEGER value: '1IJ3' # MDEV-9711 NO PAD Collatons # SET character_set_connection=utf32; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -2451,7 +2451,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -2589,8 +2589,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -2728,7 +2728,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -2866,7 +2866,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; # # End of 10.2 tests # diff --git a/mysql-test/main/ctype_utf32_uca.result b/mysql-test/main/ctype_utf32_uca.result index cf816f35d4e..e623d322d62 100644 --- a/mysql-test/main/ctype_utf32_uca.result +++ b/mysql-test/main/ctype_utf32_uca.result @@ -7338,7 +7338,7 @@ DROP TABLE t1; # MDEV-10877 xxx_unicode_nopad_ci collations # SET NAMES utf8, character_set_connection=utf32; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -7476,7 +7476,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -7614,8 +7614,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -7753,7 +7753,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -7891,7 +7891,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET NAMES utf8, collation_connection=utf32_unicode_520_nopad_ci; # # MDEV-14350 Index use with collation utf8mb4_unicode_nopad_ci on LIKE pattern with wrong results diff --git a/mysql-test/main/ctype_utf8.result b/mysql-test/main/ctype_utf8.result index bc87cdeb86e..3a6c591d6d0 100644 --- a/mysql-test/main/ctype_utf8.result +++ b/mysql-test/main/ctype_utf8.result @@ -10673,7 +10673,7 @@ DROP TABLE t1; # # MDEV-9711 NO PAD Collatons # -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -10811,7 +10811,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -10949,8 +10949,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -11088,7 +11088,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -11226,7 +11226,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; # # End of 10.2 tests # diff --git a/mysql-test/main/ctype_utf8_uca.result b/mysql-test/main/ctype_utf8_uca.result index 23e9802b61a..ef64203bbbe 100644 --- a/mysql-test/main/ctype_utf8_uca.result +++ b/mysql-test/main/ctype_utf8_uca.result @@ -5,7 +5,7 @@ # MDEV-10877 xxx_unicode_nopad_ci collations # SET NAMES utf8; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -143,7 +143,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -281,8 +281,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -420,7 +420,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -558,7 +558,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET NAMES utf8 COLLATE utf8_unicode_nopad_ci; # # MDEV-14350 Index use with collation utf8mb4_unicode_nopad_ci on LIKE pattern with wrong results diff --git a/mysql-test/main/ctype_utf8mb4.result b/mysql-test/main/ctype_utf8mb4.result index b0777a0b9f0..df40016100e 100644 --- a/mysql-test/main/ctype_utf8mb4.result +++ b/mysql-test/main/ctype_utf8mb4.result @@ -3570,7 +3570,7 @@ DROP TABLE t1; # # MDEV-9711 NO PAD Collatons # -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -3708,7 +3708,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -3846,8 +3846,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -3985,7 +3985,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -4123,7 +4123,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; # # MDEV-10867 PREPARE..EXECUTE is not consistent about non-ASCII characters # diff --git a/mysql-test/main/ctype_utf8mb4_uca.result b/mysql-test/main/ctype_utf8mb4_uca.result index 0712ca63abd..34cc443e6f6 100644 --- a/mysql-test/main/ctype_utf8mb4_uca.result +++ b/mysql-test/main/ctype_utf8mb4_uca.result @@ -6022,7 +6022,7 @@ DROP TABLE t1; # MDEV-9711 NO PAD Collatons # SET NAMES utf8mb4; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -6160,7 +6160,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -6298,8 +6298,8 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=MyISAM; # # Start of ctype_pad.inc # @@ -6437,7 +6437,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; # # Start of ctype_pad.inc # @@ -6575,7 +6575,7 @@ DROP TABLE t1; # # End of ctype_pad.inc # -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; SET NAMES utf8mb4 COLLATE utf8mb4_unicode_520_nopad_ci; # # MDEV-14350 Index use with collation utf8mb4_unicode_nopad_ci on LIKE pattern with wrong results diff --git a/mysql-test/main/deadlock_innodb.result b/mysql-test/main/deadlock_innodb.result index fca0ff6be0c..09958bf0413 100644 --- a/mysql-test/main/deadlock_innodb.result +++ b/mysql-test/main/deadlock_innodb.result @@ -115,7 +115,7 @@ disconnect con1; disconnect con2; drop table t1, t2; End of 4.1 tests -set storage_engine=innodb; +set default_storage_engine=innodb; drop table if exists a; drop table if exists A; create table A (c int); @@ -123,5 +123,5 @@ insert into A (c) values (0); create table a as select * from A; drop table A; drop table if exists a; -set storage_engine=default; +set default_storage_engine=default; End of 5.0 tests. diff --git a/mysql-test/main/delayed.test b/mysql-test/main/delayed.test index 573985fec1f..a96ffdfcca9 100644 --- a/mysql-test/main/delayed.test +++ b/mysql-test/main/delayed.test @@ -15,9 +15,9 @@ # limit the test to engines which support INSERT DELAYED disable_query_log; --require include/true.require -select @@global.storage_engine in +select @@global.default_storage_engine in ("memory","myisam","archive","blackhole") and -@@session.storage_engine in +@@session.default_storage_engine in ("memory","myisam","archive","blackhole") as `TRUE`; enable_query_log; diff --git a/mysql-test/main/func_group_innodb.result b/mysql-test/main/func_group_innodb.result index a4c9b574585..f5a823e4638 100644 --- a/mysql-test/main/func_group_innodb.result +++ b/mysql-test/main/func_group_innodb.result @@ -225,8 +225,8 @@ DROP TABLE t1; # # MDEV-4269: crash when grouping by values() # -SELECT @@storage_engine INTO @old_engine; -set storage_engine=innodb; +SELECT @@default_storage_engine INTO @old_engine; +set default_storage_engine=innodb; create table y select 1 b; select 1 from y group by b; 1 @@ -235,7 +235,7 @@ select 1 from y group by value(b); 1 1 drop table y; -SET storage_engine=@old_engine; +SET default_storage_engine=@old_engine; # # Bug#13723054 CRASH WITH MIN/MAX AFTER QUICK_GROUP_MIN_MAX_SELECT::NEXT_MIN # diff --git a/mysql-test/main/func_group_innodb.test b/mysql-test/main/func_group_innodb.test index 6141b4d85ed..748c64a43c6 100644 --- a/mysql-test/main/func_group_innodb.test +++ b/mysql-test/main/func_group_innodb.test @@ -170,14 +170,14 @@ DROP TABLE t1; --echo # MDEV-4269: crash when grouping by values() --echo # -SELECT @@storage_engine INTO @old_engine; -set storage_engine=innodb; +SELECT @@default_storage_engine INTO @old_engine; +set default_storage_engine=innodb; create table y select 1 b; select 1 from y group by b; select 1 from y group by value(b); drop table y; -SET storage_engine=@old_engine; +SET default_storage_engine=@old_engine; ### End of 5.1 tests diff --git a/mysql-test/main/func_time.result b/mysql-test/main/func_time.result index 59ad815b0e0..a9b27a15fa7 100644 --- a/mysql-test/main/func_time.result +++ b/mysql-test/main/func_time.result @@ -1699,8 +1699,8 @@ NULL SELECT MONTHNAME(0), MONTHNAME(0) IS NULL, MONTHNAME(0) + 1; MONTHNAME(0) MONTHNAME(0) IS NULL MONTHNAME(0) + 1 NULL 1 NULL -SET storage_engine=NULL; -ERROR 42000: Variable 'storage_engine' can't be set to the value of 'NULL' +SET default_storage_engine=NULL; +ERROR 42000: Variable 'default_storage_engine' can't be set to the value of 'NULL' # # BUG#13354387 - CRASH IN IN MY_DECIMAL::OPERATOR FOR VIEW AND FUNCTION UNIX_TIMESTAMP # Part1 (5.5) diff --git a/mysql-test/main/func_time.test b/mysql-test/main/func_time.test index 71f82ddba7b..970d3e44a77 100644 --- a/mysql-test/main/func_time.test +++ b/mysql-test/main/func_time.test @@ -1016,7 +1016,7 @@ SELECT SUBDATE(STR_TO_DATE(NULL,0), INTERVAL 1 HOUR); --echo # SELECT MONTHNAME(0), MONTHNAME(0) IS NULL, MONTHNAME(0) + 1; --error ER_WRONG_VALUE_FOR_VAR -SET storage_engine=NULL; +SET default_storage_engine=NULL; --echo # diff --git a/mysql-test/main/index_intersect_innodb.result b/mysql-test/main/index_intersect_innodb.result index fd07f6b41c6..45f3152fa41 100644 --- a/mysql-test/main/index_intersect_innodb.result +++ b/mysql-test/main/index_intersect_innodb.result @@ -1,4 +1,4 @@ -SET SESSION STORAGE_ENGINE='InnoDB'; +SET SESSION DEFAULT_STORAGE_ENGINE='InnoDB'; set @innodb_stats_persistent_save= @@innodb_stats_persistent; set @innodb_stats_persistent_sample_pages_save= @@innodb_stats_persistent_sample_pages; @@ -983,4 +983,4 @@ SET SESSION optimizer_switch='rowid_filter=default'; set global innodb_stats_persistent= @innodb_stats_persistent_save; set global innodb_stats_persistent_sample_pages= @innodb_stats_persistent_sample_pages_save; -SET SESSION STORAGE_ENGINE=DEFAULT; +SET SESSION DEFAULT_STORAGE_ENGINE=DEFAULT; diff --git a/mysql-test/main/index_intersect_innodb.test b/mysql-test/main/index_intersect_innodb.test index 637056ad795..d1c6ac7fa16 100644 --- a/mysql-test/main/index_intersect_innodb.test +++ b/mysql-test/main/index_intersect_innodb.test @@ -1,6 +1,6 @@ --source include/have_innodb.inc -SET SESSION STORAGE_ENGINE='InnoDB'; +SET SESSION DEFAULT_STORAGE_ENGINE='InnoDB'; set @innodb_stats_persistent_save= @@innodb_stats_persistent; set @innodb_stats_persistent_sample_pages_save= @@ -13,4 +13,4 @@ set global innodb_stats_persistent= @innodb_stats_persistent_save; set global innodb_stats_persistent_sample_pages= @innodb_stats_persistent_sample_pages_save; -SET SESSION STORAGE_ENGINE=DEFAULT; +SET SESSION DEFAULT_STORAGE_ENGINE=DEFAULT; diff --git a/mysql-test/main/index_merge_innodb.result b/mysql-test/main/index_merge_innodb.result index 5a3e0286121..b7c006c09e8 100644 --- a/mysql-test/main/index_merge_innodb.result +++ b/mysql-test/main/index_merge_innodb.result @@ -2,7 +2,7 @@ connect disable_purge,localhost,root,,; # Disable the purge of InnoDB history, to make the test run faster. START TRANSACTION WITH CONSISTENT SNAPSHOT; connection default; -SET STORAGE_ENGINE = InnoDB; +SET DEFAULT_STORAGE_ENGINE = InnoDB; set @optimizer_switch_save= @@optimizer_switch; set optimizer_switch='index_merge_sort_intersection=off'; set optimizer_switch='rowid_filter=off'; diff --git a/mysql-test/main/index_merge_innodb.test b/mysql-test/main/index_merge_innodb.test index fac199b1513..27125c319f5 100644 --- a/mysql-test/main/index_merge_innodb.test +++ b/mysql-test/main/index_merge_innodb.test @@ -19,7 +19,7 @@ connect disable_purge,localhost,root,,; START TRANSACTION WITH CONSISTENT SNAPSHOT; connection default; -SET STORAGE_ENGINE = InnoDB; +SET DEFAULT_STORAGE_ENGINE = InnoDB; # InnoDB does not support Merge tables (affects include/index_merge1.inc) let $merge_table_support= 0; diff --git a/mysql-test/main/index_merge_myisam.result b/mysql-test/main/index_merge_myisam.result index 103ae93a992..1d39878287a 100644 --- a/mysql-test/main/index_merge_myisam.result +++ b/mysql-test/main/index_merge_myisam.result @@ -1,4 +1,4 @@ -SET STORAGE_ENGINE = MyISAM; +SET DEFAULT_STORAGE_ENGINE = MyISAM; set @optimizer_switch_save= @@optimizer_switch; set optimizer_switch='rowid_filter=off'; set optimizer_switch='index_merge_sort_intersection=off'; diff --git a/mysql-test/main/index_merge_myisam.test b/mysql-test/main/index_merge_myisam.test index da5b198163d..13d1842173c 100644 --- a/mysql-test/main/index_merge_myisam.test +++ b/mysql-test/main/index_merge_myisam.test @@ -10,7 +10,7 @@ # include/index_merge*.inc files # -SET STORAGE_ENGINE = MyISAM; +SET DEFAULT_STORAGE_ENGINE = MyISAM; # MyISAM supports Merge tables let $merge_table_support= 1; diff --git a/mysql-test/main/innodb_ext_key.result b/mysql-test/main/innodb_ext_key.result index e0fa55735d8..27cb1657719 100644 --- a/mysql-test/main/innodb_ext_key.result +++ b/mysql-test/main/innodb_ext_key.result @@ -1,6 +1,6 @@ DROP TABLE IF EXISTS t1,t2,t3,t4; DROP DATABASE IF EXISTS dbt3_s001; -SET SESSION STORAGE_ENGINE='InnoDB'; +SET SESSION DEFAULT_STORAGE_ENGINE='InnoDB'; set @innodb_stats_persistent_save= @@innodb_stats_persistent; set @innodb_stats_persistent_sample_pages_save= @@innodb_stats_persistent_sample_pages; diff --git a/mysql-test/main/innodb_ext_key.test b/mysql-test/main/innodb_ext_key.test index bb02bdf4615..f6e9e46ac24 100644 --- a/mysql-test/main/innodb_ext_key.test +++ b/mysql-test/main/innodb_ext_key.test @@ -5,7 +5,7 @@ DROP TABLE IF EXISTS t1,t2,t3,t4; DROP DATABASE IF EXISTS dbt3_s001; --enable_warnings -SET SESSION STORAGE_ENGINE='InnoDB'; +SET SESSION DEFAULT_STORAGE_ENGINE='InnoDB'; set @innodb_stats_persistent_save= @@innodb_stats_persistent; set @innodb_stats_persistent_sample_pages_save= diff --git a/mysql-test/main/innodb_icp.result b/mysql-test/main/innodb_icp.result index 5a3a5b6432b..1f0cac4dcc7 100644 --- a/mysql-test/main/innodb_icp.result +++ b/mysql-test/main/innodb_icp.result @@ -1,5 +1,5 @@ -set @save_storage_engine= @@storage_engine; -set storage_engine=InnoDB; +set @save_storage_engine= @@default_storage_engine; +set default_storage_engine=InnoDB; set @innodb_stats_persistent_save= @@innodb_stats_persistent; set @innodb_stats_persistent_sample_pages_save= @@innodb_stats_persistent_sample_pages; @@ -963,7 +963,7 @@ pk key1 key2 142 frequent-val rare-42 drop table t1, t2; set optimizer_switch=@innodb_icp_tmp; -set storage_engine= @save_storage_engine; +set default_storage_engine= @save_storage_engine; set global innodb_stats_persistent= @innodb_stats_persistent_save; set global innodb_stats_persistent_sample_pages= @innodb_stats_persistent_sample_pages_save; diff --git a/mysql-test/main/innodb_icp.test b/mysql-test/main/innodb_icp.test index 9081b886224..d1f188afd64 100644 --- a/mysql-test/main/innodb_icp.test +++ b/mysql-test/main/innodb_icp.test @@ -5,8 +5,8 @@ --source include/have_innodb.inc --source include/default_optimizer_switch.inc -set @save_storage_engine= @@storage_engine; -set storage_engine=InnoDB; +set @save_storage_engine= @@default_storage_engine; +set default_storage_engine=InnoDB; set @innodb_stats_persistent_save= @@innodb_stats_persistent; set @innodb_stats_persistent_sample_pages_save= @@ -82,7 +82,7 @@ drop table t1, t2; set optimizer_switch=@innodb_icp_tmp; -set storage_engine= @save_storage_engine; +set default_storage_engine= @save_storage_engine; set global innodb_stats_persistent= @innodb_stats_persistent_save; set global innodb_stats_persistent_sample_pages= diff --git a/mysql-test/main/innodb_mrr_cpk.result b/mysql-test/main/innodb_mrr_cpk.result index a2e43d7d127..8b9260f4596 100644 --- a/mysql-test/main/innodb_mrr_cpk.result +++ b/mysql-test/main/innodb_mrr_cpk.result @@ -3,8 +3,8 @@ set @innodb_mrr_cpk_tmp=@@optimizer_switch; set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on'; set @save_join_cache_level=@@join_cache_level; set join_cache_level=6; -set @save_storage_engine=@@storage_engine; -set storage_engine=innodb; +set @save_storage_engine=@@default_storage_engine; +set default_storage_engine=innodb; create table t0(a int); insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); create table t1(a char(8), b char(8), filler char(100), primary key(a)); @@ -234,5 +234,5 @@ drop table t0,t1,t2; # This must be at the end: # set @@join_cache_level= @save_join_cache_level; -set storage_engine=@save_storage_engine; +set default_storage_engine=@save_storage_engine; set optimizer_switch=@innodb_mrr_cpk_tmp; diff --git a/mysql-test/main/innodb_mrr_cpk.test b/mysql-test/main/innodb_mrr_cpk.test index cb79c238f2b..cbebafd3053 100644 --- a/mysql-test/main/innodb_mrr_cpk.test +++ b/mysql-test/main/innodb_mrr_cpk.test @@ -23,8 +23,8 @@ set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on'; set @save_join_cache_level=@@join_cache_level; set join_cache_level=6; -set @save_storage_engine=@@storage_engine; -set storage_engine=innodb; +set @save_storage_engine=@@default_storage_engine; +set default_storage_engine=innodb; create table t0(a int); insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); @@ -225,5 +225,5 @@ drop table t0,t1,t2; --echo # set @@join_cache_level= @save_join_cache_level; -set storage_engine=@save_storage_engine; +set default_storage_engine=@save_storage_engine; set optimizer_switch=@innodb_mrr_cpk_tmp; diff --git a/mysql-test/main/key_cache.result b/mysql-test/main/key_cache.result index 36c75ad4a5d..a23b13f26d1 100644 --- a/mysql-test/main/key_cache.result +++ b/mysql-test/main/key_cache.result @@ -43,8 +43,8 @@ SELECT @@medium.key_buffer_size; SET @@global.key_buffer_size=@save_key_buffer_size; SELECT @@default.key_buffer_size; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'default.key_buffer_size' at line 1 -SELECT @@skr.storage_engine="test"; -ERROR HY000: Variable 'storage_engine' is not a variable component (can't be used as XXXX.variable_name) +SELECT @@skr.default_storage_engine="test"; +ERROR HY000: Variable 'default_storage_engine' is not a variable component (can't be used as XXXX.variable_name) select @@keycache1.key_cache_block_size; @@keycache1.key_cache_block_size 0 diff --git a/mysql-test/main/key_cache.test b/mysql-test/main/key_cache.test index fb6ae497e74..50305d499b3 100644 --- a/mysql-test/main/key_cache.test +++ b/mysql-test/main/key_cache.test @@ -45,7 +45,7 @@ SET @@global.key_buffer_size=@save_key_buffer_size; --error 1064 SELECT @@default.key_buffer_size; --error ER_VARIABLE_IS_NOT_STRUCT -SELECT @@skr.storage_engine="test"; +SELECT @@skr.default_storage_engine="test"; select @@keycache1.key_cache_block_size; select @@keycache1.key_buffer_size; diff --git a/mysql-test/main/loaddata_autocom_innodb.result b/mysql-test/main/loaddata_autocom_innodb.result index 9f5a0809f2a..6967d4143bb 100644 --- a/mysql-test/main/loaddata_autocom_innodb.result +++ b/mysql-test/main/loaddata_autocom_innodb.result @@ -1,4 +1,4 @@ -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; drop table if exists t1; create table t1 (id int unsigned not null auto_increment primary key, a text, b text); start transaction; diff --git a/mysql-test/main/log_tables.result b/mysql-test/main/log_tables.result index aed5dbfba3d..43f44c90b06 100644 --- a/mysql-test/main/log_tables.result +++ b/mysql-test/main/log_tables.result @@ -251,14 +251,14 @@ lock tables mysql.slow_log READ; ERROR HY000: You can't use locks with log tables set global general_log='OFF'; set global slow_query_log='OFF'; -set @save_storage_engine= @@session.storage_engine; -set storage_engine= MEMORY; +set @save_storage_engine= @@session.default_storage_engine; +set default_storage_engine= MEMORY; alter table mysql.slow_log engine=NonExistentEngine; Warnings: Warning 1286 Unknown storage engine 'NonExistentEngine' alter table mysql.slow_log engine=memory; ERROR HY000: Storage engine MEMORY cannot be used for log tables -set storage_engine= @save_storage_engine; +set default_storage_engine= @save_storage_engine; drop table mysql.slow_log; drop table mysql.general_log; drop table mysql.general_log; diff --git a/mysql-test/main/log_tables.test b/mysql-test/main/log_tables.test index 4ea8a7639ef..4622b09079f 100644 --- a/mysql-test/main/log_tables.test +++ b/mysql-test/main/log_tables.test @@ -252,8 +252,8 @@ set global general_log='OFF'; set global slow_query_log='OFF'; # check that alter table doesn't work for other engines -set @save_storage_engine= @@session.storage_engine; -set storage_engine= MEMORY; +set @save_storage_engine= @@session.default_storage_engine; +set default_storage_engine= MEMORY; # After fixing bug#35765 the error behaivor changed: # If compiled in/enabled ER_UNSUPORTED_LOG_ENGINE # If not (i.e. not existant) it will show a warning @@ -267,7 +267,7 @@ alter table mysql.slow_log engine=memory; #alter table mysql.slow_log engine=archive; #--error ER_UNSUPORTED_LOG_ENGINE #alter table mysql.slow_log engine=blackhole; -set storage_engine= @save_storage_engine; +set default_storage_engine= @save_storage_engine; drop table mysql.slow_log; drop table mysql.general_log; diff --git a/mysql-test/main/merge.result b/mysql-test/main/merge.result index 075152da1c7..0d6f387a7bc 100644 --- a/mysql-test/main/merge.result +++ b/mysql-test/main/merge.result @@ -1,4 +1,4 @@ -set @save_default_storage_engine=@@global.storage_engine; +set @save_default_storage_engine=@@global.default_storage_engine; set global default_storage_engine=myisam; set session default_storage_engine=myisam; drop table if exists t1,t2,t3,t4,t5,t6; diff --git a/mysql-test/main/merge.test b/mysql-test/main/merge.test index c22cf3950c1..888b41b24bd 100644 --- a/mysql-test/main/merge.test +++ b/mysql-test/main/merge.test @@ -6,7 +6,7 @@ --source include/count_sessions.inc # MERGE tables require MyISAM tables -set @save_default_storage_engine=@@global.storage_engine; +set @save_default_storage_engine=@@global.default_storage_engine; set global default_storage_engine=myisam; set session default_storage_engine=myisam; diff --git a/mysql-test/main/merge_debug.result b/mysql-test/main/merge_debug.result index 29858810ff1..36cf254f87e 100644 --- a/mysql-test/main/merge_debug.result +++ b/mysql-test/main/merge_debug.result @@ -1,6 +1,6 @@ -set @default_storage_engine= @@global.storage_engine; -set global storage_engine=myisam; -set session storage_engine=myisam; +set @default_storage_engine= @@global.default_storage_engine; +set global default_storage_engine=myisam; +set session default_storage_engine=myisam; call mtr.add_suppression("Index for table .*crashed' is corrupt; try to repair it"); drop table if exists crashed,t2,t3,t4; SET @orig_debug=@@global.debug_dbug; @@ -24,4 +24,4 @@ INSERT INTO t3 VALUES (31); UNLOCK TABLES; DROP TRIGGER t1_ai; DROP TABLE t4,crashed,t2,t3; -set global storage_engine=@default_storage_engine; +set global default_storage_engine=@default_storage_engine; diff --git a/mysql-test/main/merge_debug.test b/mysql-test/main/merge_debug.test index 50017bc1331..4141042c261 100644 --- a/mysql-test/main/merge_debug.test +++ b/mysql-test/main/merge_debug.test @@ -4,9 +4,9 @@ --source include/have_debug.inc -set @default_storage_engine= @@global.storage_engine; -set global storage_engine=myisam; -set session storage_engine=myisam; +set @default_storage_engine= @@global.default_storage_engine; +set global default_storage_engine=myisam; +set session default_storage_engine=myisam; call mtr.add_suppression("Index for table .*crashed' is corrupt; try to repair it"); @@ -43,4 +43,4 @@ UNLOCK TABLES; DROP TRIGGER t1_ai; DROP TABLE t4,crashed,t2,t3; -set global storage_engine=@default_storage_engine; +set global default_storage_engine=@default_storage_engine; diff --git a/mysql-test/main/merge_mmap.result b/mysql-test/main/merge_mmap.result index e8014259a4a..8e655a0491b 100644 --- a/mysql-test/main/merge_mmap.result +++ b/mysql-test/main/merge_mmap.result @@ -1,5 +1,5 @@ -SET GLOBAL storage_engine = MyISAM; -SET SESSION storage_engine = MyISAM; +SET GLOBAL default_storage_engine = MyISAM; +SET SESSION default_storage_engine = MyISAM; DROP TABLE IF EXISTS t1, t2, m1, m2; CREATE TABLE t1 (c1 INT); CREATE TABLE t2 (c1 INT); diff --git a/mysql-test/main/merge_mmap.test b/mysql-test/main/merge_mmap.test index c97b029754d..f3fce257f06 100644 --- a/mysql-test/main/merge_mmap.test +++ b/mysql-test/main/merge_mmap.test @@ -3,9 +3,9 @@ # # MERGE tables require MyISAM tables ---let $default=`SELECT @@global.storage_engine` -SET GLOBAL storage_engine = MyISAM; -SET SESSION storage_engine = MyISAM; +--let $default=`SELECT @@global.default_storage_engine` +SET GLOBAL default_storage_engine = MyISAM; +SET SESSION default_storage_engine = MyISAM; # Clean up resources used in this test case. --disable_warnings @@ -146,6 +146,6 @@ DROP TABLE m2, m1, t2, t1; --disable_result_log --disable_query_log -eval SET GLOBAL storage_engine = $default; +eval SET GLOBAL default_storage_engine = $default; --enable_result_log --enable_query_log diff --git a/mysql-test/main/mix2_myisam.result b/mysql-test/main/mix2_myisam.result index 3a4bb5ae0ed..91d51f82532 100644 --- a/mysql-test/main/mix2_myisam.result +++ b/mysql-test/main/mix2_myisam.result @@ -1,5 +1,5 @@ call mtr.add_suppression("Can't find record in .*"); -SET SESSION STORAGE_ENGINE = MEMORY; +SET SESSION DEFAULT_STORAGE_ENGINE = MEMORY; drop table if exists t1,t2,t3,t4; drop database if exists mysqltest; create table t1 (id int unsigned not null auto_increment, code tinyint unsigned not null, name char(20) not null, primary key (id), key (code), unique (name)) engine=MyISAM; @@ -1411,7 +1411,7 @@ select count(*) from t1 where x = 18446744073709551601; count(*) 1 drop table t1; -set storage_engine=MyISAM; +set default_storage_engine=MyISAM; drop table if exists t1,t2,t3; --- Testing varchar --- --- Testing varchar --- @@ -2012,7 +2012,7 @@ t1 CREATE TABLE `t1` ( `v` mediumtext CHARACTER SET utf8 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; -set storage_engine=MEMORY; +set default_storage_engine=MEMORY; create table t1 (v varchar(16384)) engine=MyISAM; drop table t1; create table t1 (a char(1), b char(1), key(a, b)) engine=MyISAM; diff --git a/mysql-test/main/myisam.result b/mysql-test/main/myisam.result index ce2baa03134..1178cca9ed0 100644 --- a/mysql-test/main/myisam.result +++ b/mysql-test/main/myisam.result @@ -1127,7 +1127,7 @@ length(c1) c1 2 B DROP TABLE t1; End of 4.1 tests -set storage_engine=MyISAM; +set default_storage_engine=MyISAM; drop table if exists t1,t2,t3; --- Testing varchar --- --- Testing varchar --- @@ -1738,7 +1738,7 @@ t1 CREATE TABLE `t1` ( `v` text DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; -set storage_engine=MyISAM; +set default_storage_engine=MyISAM; set @save_concurrent_insert=@@concurrent_insert; set global concurrent_insert=1; create table t1 (a int); diff --git a/mysql-test/main/myisam.test b/mysql-test/main/myisam.test index 0b153514ecb..c73a66ea64a 100644 --- a/mysql-test/main/myisam.test +++ b/mysql-test/main/myisam.test @@ -1023,8 +1023,8 @@ DROP TABLE t1; # Test varchar # -let $default=`select @@storage_engine`; -set storage_engine=MyISAM; +let $default=`select @@default_storage_engine`; +set default_storage_engine=MyISAM; source include/varchar.inc; # @@ -1048,7 +1048,7 @@ create table t1 (v varchar(65535)); show create table t1; drop table t1; -eval set storage_engine=$default; +eval set default_storage_engine=$default; # # Test concurrent insert diff --git a/mysql-test/main/mysqldump-max.result b/mysql-test/main/mysqldump-max.result index f936184849f..c1825814919 100644 --- a/mysql-test/main/mysqldump-max.result +++ b/mysql-test/main/mysqldump-max.result @@ -277,8 +277,8 @@ drop table t3; drop table t4; drop table t5; drop table t6; -SELECT @@global.storage_engine INTO @old_engine; -SET GLOBAL storage_engine=InnoDB; +SELECT @@global.default_storage_engine INTO @old_engine; +SET GLOBAL default_storage_engine=InnoDB; CREATE VIEW v1 AS SELECT * FROM t1; INSERT INTO t1 VALUES(); SELECT COUNT(*) FROM v1; @@ -289,7 +289,7 @@ COUNT(*) 1 DROP VIEW v1; DROP TABLE t1; -SET GLOBAL storage_engine=@old_engine; +SET GLOBAL default_storage_engine=@old_engine; connect c1,127.0.0.1,root,,test,$MASTER_MYPORT,; connect c2,127.0.0.1,root,,test,$MASTER_MYPORT,; connect c3,127.0.0.1,root,,test,$MASTER_MYPORT,; diff --git a/mysql-test/main/mysqldump-max.test b/mysql-test/main/mysqldump-max.test index a989fd28135..49e54d542b8 100644 --- a/mysql-test/main/mysqldump-max.test +++ b/mysql-test/main/mysqldump-max.test @@ -81,8 +81,8 @@ drop table t6; # type to avoid Inno's column-number limits (~1000 columns) etc. # Here because it needs Inno-engine. -SELECT @@global.storage_engine INTO @old_engine; -SET GLOBAL storage_engine=InnoDB; +SELECT @@global.default_storage_engine INTO @old_engine; +SET GLOBAL default_storage_engine=InnoDB; --disable_query_log CREATE TABLE `t1` ( @@ -1128,7 +1128,7 @@ SELECT COUNT(*) FROM v1; DROP VIEW v1; DROP TABLE t1; -SET GLOBAL storage_engine=@old_engine; +SET GLOBAL default_storage_engine=@old_engine; # Test fully non-locking mysqldump with consistent binlog position (MWL#136). diff --git a/mysql-test/main/partition_cache.result b/mysql-test/main/partition_cache.result index 697ba1bcd15..0bd8d70e9cb 100644 --- a/mysql-test/main/partition_cache.result +++ b/mysql-test/main/partition_cache.result @@ -1,6 +1,6 @@ SET global query_cache_type=ON; SET local query_cache_type=ON; -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; drop table if exists t1,t2,t3; set @save_query_cache_size = @@global.query_cache_size; set GLOBAL query_cache_size = 1355776; @@ -114,7 +114,7 @@ count(*) 1 drop table t1; connect connection1,localhost,root,,; -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; SET @@autocommit=1; connection default; SHOW VARIABLES LIKE 'have_query_cache'; @@ -123,7 +123,7 @@ have_query_cache YES SET GLOBAL query_cache_size = 204800; flush status; SET @@autocommit=1; -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; CREATE TABLE t2 (s1 int, s2 varchar(1000), key(s1)) PARTITION BY KEY (s1) PARTITIONS 3; INSERT INTO t2 VALUES (1,repeat('a',10)),(2,repeat('a',10)),(3,repeat('a',10)),(4,repeat('a',10)); COMMIT; diff --git a/mysql-test/main/partition_cache_innodb.result b/mysql-test/main/partition_cache_innodb.result index e6e69ee686e..0cd60fa11a0 100644 --- a/mysql-test/main/partition_cache_innodb.result +++ b/mysql-test/main/partition_cache_innodb.result @@ -1,6 +1,6 @@ SET global query_cache_type=ON; SET local query_cache_type=ON; -SET SESSION STORAGE_ENGINE = innodb; +SET SESSION DEFAULT_STORAGE_ENGINE = innodb; drop table if exists t1; set @save_query_cache_size = @@global.query_cache_size; # Test that partitions works with query cache diff --git a/mysql-test/main/partition_cache_myisam.result b/mysql-test/main/partition_cache_myisam.result index d8e4f837ff7..441a7d080c3 100644 --- a/mysql-test/main/partition_cache_myisam.result +++ b/mysql-test/main/partition_cache_myisam.result @@ -1,6 +1,6 @@ SET global query_cache_type=ON; SET local query_cache_type=ON; -SET SESSION STORAGE_ENGINE = myisam; +SET SESSION DEFAULT_STORAGE_ENGINE = myisam; drop table if exists t1; set @save_query_cache_size = @@global.query_cache_size; # Test that partitions works with query cache diff --git a/mysql-test/main/partition_mrr_aria.result b/mysql-test/main/partition_mrr_aria.result index 7a0c35a309e..8e7f893e609 100644 --- a/mysql-test/main/partition_mrr_aria.result +++ b/mysql-test/main/partition_mrr_aria.result @@ -4,8 +4,8 @@ drop table if exists t1,t3; # create table t1(a int); insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); -set @tmp=@@storage_engine; -set storage_engine=Aria; +set @tmp=@@default_storage_engine; +set default_storage_engine=Aria; create table t3 ( ID bigint(20) NOT NULL AUTO_INCREMENT, part_id int, @@ -32,7 +32,7 @@ t3 CREATE TABLE `t3` ( (PARTITION `p1` VALUES LESS THAN (3) ENGINE = Aria, PARTITION `p2` VALUES LESS THAN (7) ENGINE = Aria, PARTITION `p3` VALUES LESS THAN (10) ENGINE = Aria) -set storage_engine= @tmp; +set default_storage_engine= @tmp; insert into t3 select A.a+10*B.a, A.a, diff --git a/mysql-test/main/partition_mrr_innodb.result b/mysql-test/main/partition_mrr_innodb.result index c188f7e9929..10ecb0c878f 100644 --- a/mysql-test/main/partition_mrr_innodb.result +++ b/mysql-test/main/partition_mrr_innodb.result @@ -4,8 +4,8 @@ drop table if exists t1,t3; # create table t1(a int); insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); -set @tmp=@@storage_engine; -set storage_engine=InnoDB; +set @tmp=@@default_storage_engine; +set default_storage_engine=InnoDB; create table t3 ( ID bigint(20) NOT NULL AUTO_INCREMENT, part_id int, @@ -32,7 +32,7 @@ t3 CREATE TABLE `t3` ( (PARTITION `p1` VALUES LESS THAN (3) ENGINE = InnoDB, PARTITION `p2` VALUES LESS THAN (7) ENGINE = InnoDB, PARTITION `p3` VALUES LESS THAN (10) ENGINE = InnoDB) -set storage_engine= @tmp; +set default_storage_engine= @tmp; insert into t3 select A.a+10*B.a, A.a, diff --git a/mysql-test/main/partition_mrr_myisam.result b/mysql-test/main/partition_mrr_myisam.result index 1f1cea8e9d6..2b172e6bd7b 100644 --- a/mysql-test/main/partition_mrr_myisam.result +++ b/mysql-test/main/partition_mrr_myisam.result @@ -4,8 +4,8 @@ drop table if exists t1,t3; # create table t1(a int); insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); -set @tmp=@@storage_engine; -set storage_engine=myisam; +set @tmp=@@default_storage_engine; +set default_storage_engine=myisam; create table t3 ( ID bigint(20) NOT NULL AUTO_INCREMENT, part_id int, @@ -32,7 +32,7 @@ t3 CREATE TABLE `t3` ( (PARTITION `p1` VALUES LESS THAN (3) ENGINE = MyISAM, PARTITION `p2` VALUES LESS THAN (7) ENGINE = MyISAM, PARTITION `p3` VALUES LESS THAN (10) ENGINE = MyISAM) -set storage_engine= @tmp; +set default_storage_engine= @tmp; insert into t3 select A.a+10*B.a, A.a, diff --git a/mysql-test/main/range_vs_index_merge_innodb.result b/mysql-test/main/range_vs_index_merge_innodb.result index e2fd8020049..f50f79efa31 100644 --- a/mysql-test/main/range_vs_index_merge_innodb.result +++ b/mysql-test/main/range_vs_index_merge_innodb.result @@ -1,4 +1,4 @@ -SET SESSION STORAGE_ENGINE='InnoDB'; +SET SESSION DEFAULT_STORAGE_ENGINE='InnoDB'; set @innodb_stats_persistent_save= @@innodb_stats_persistent; set @innodb_stats_persistent_sample_pages_save= @@innodb_stats_persistent_sample_pages; @@ -1950,4 +1950,4 @@ set session optimizer_switch='index_merge_sort_intersection=default'; set global innodb_stats_persistent= @innodb_stats_persistent_save; set global innodb_stats_persistent_sample_pages= @innodb_stats_persistent_sample_pages_save; -SET SESSION STORAGE_ENGINE=DEFAULT; +SET SESSION DEFAULT_STORAGE_ENGINE=DEFAULT; diff --git a/mysql-test/main/range_vs_index_merge_innodb.test b/mysql-test/main/range_vs_index_merge_innodb.test index 5117ee3668a..4f58bbec1f2 100644 --- a/mysql-test/main/range_vs_index_merge_innodb.test +++ b/mysql-test/main/range_vs_index_merge_innodb.test @@ -1,6 +1,6 @@ --source include/have_innodb.inc -SET SESSION STORAGE_ENGINE='InnoDB'; +SET SESSION DEFAULT_STORAGE_ENGINE='InnoDB'; set @innodb_stats_persistent_save= @@innodb_stats_persistent; set @innodb_stats_persistent_sample_pages_save= @@ -13,4 +13,4 @@ set global innodb_stats_persistent= @innodb_stats_persistent_save; set global innodb_stats_persistent_sample_pages= @innodb_stats_persistent_sample_pages_save; -SET SESSION STORAGE_ENGINE=DEFAULT; +SET SESSION DEFAULT_STORAGE_ENGINE=DEFAULT; diff --git a/mysql-test/main/read_many_rows_innodb.result b/mysql-test/main/read_many_rows_innodb.result index 24f9a2d54a5..80e831ca045 100644 --- a/mysql-test/main/read_many_rows_innodb.result +++ b/mysql-test/main/read_many_rows_innodb.result @@ -1,4 +1,4 @@ -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; DROP TABLE IF EXISTS t1, t2, t3, t4; CREATE TABLE t1 (id INTEGER) ENGINE=MyISAM; CREATE TABLE t2 (id INTEGER PRIMARY KEY); diff --git a/mysql-test/main/rowid_filter_innodb.result b/mysql-test/main/rowid_filter_innodb.result index aad4deca155..bc7b220d92d 100644 --- a/mysql-test/main/rowid_filter_innodb.result +++ b/mysql-test/main/rowid_filter_innodb.result @@ -1,4 +1,4 @@ -SET SESSION STORAGE_ENGINE='InnoDB'; +SET SESSION DEFAULT_STORAGE_ENGINE='InnoDB'; DROP DATABASE IF EXISTS dbt3_s001; CREATE DATABASE dbt3_s001; use dbt3_s001; @@ -2235,7 +2235,7 @@ a b 22 2 drop table t1; set optimizer_switch=@save_optimizer_switch; -SET SESSION STORAGE_ENGINE=DEFAULT; +SET SESSION DEFAULT_STORAGE_ENGINE=DEFAULT; # # MDEV-19919: use of rowid filter for innodb table + ORDER BY # diff --git a/mysql-test/main/rowid_filter_innodb.test b/mysql-test/main/rowid_filter_innodb.test index 30e0edeb75a..cd64972e100 100644 --- a/mysql-test/main/rowid_filter_innodb.test +++ b/mysql-test/main/rowid_filter_innodb.test @@ -1,6 +1,6 @@ --source include/have_innodb.inc -SET SESSION STORAGE_ENGINE='InnoDB'; +SET SESSION DEFAULT_STORAGE_ENGINE='InnoDB'; --source rowid_filter.test --source include/have_sequence.inc @@ -95,7 +95,7 @@ eval $q1; drop table t1; set optimizer_switch=@save_optimizer_switch; -SET SESSION STORAGE_ENGINE=DEFAULT; +SET SESSION DEFAULT_STORAGE_ENGINE=DEFAULT; --echo # --echo # MDEV-19919: use of rowid filter for innodb table + ORDER BY diff --git a/mysql-test/main/rowid_order_innodb.result b/mysql-test/main/rowid_order_innodb.result index dc339304041..9b32bf6018f 100644 --- a/mysql-test/main/rowid_order_innodb.result +++ b/mysql-test/main/rowid_order_innodb.result @@ -1,4 +1,4 @@ -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; drop table if exists t1, t2, t3,t4; create table t1 ( pk1 int not NULL, diff --git a/mysql-test/main/selectivity_innodb.result b/mysql-test/main/selectivity_innodb.result index 062b2da7b4f..8f079993c1b 100644 --- a/mysql-test/main/selectivity_innodb.result +++ b/mysql-test/main/selectivity_innodb.result @@ -1,4 +1,4 @@ -SET SESSION STORAGE_ENGINE='InnoDB'; +SET SESSION DEFAULT_STORAGE_ENGINE='InnoDB'; set @save_optimizer_switch_for_selectivity_test=@@optimizer_switch; set optimizer_switch='extended_keys=on'; drop table if exists t0,t1,t2,t3; @@ -2028,4 +2028,4 @@ drop view v1; set use_stat_tables= @tmp_ust; set optimizer_use_condition_selectivity= @tmp_oucs; set @@global.histogram_size=@save_histogram_size; -SET SESSION STORAGE_ENGINE=DEFAULT; +SET SESSION DEFAULT_STORAGE_ENGINE=DEFAULT; diff --git a/mysql-test/main/selectivity_innodb.test b/mysql-test/main/selectivity_innodb.test index 6c457e2848b..b98b5342183 100644 --- a/mysql-test/main/selectivity_innodb.test +++ b/mysql-test/main/selectivity_innodb.test @@ -3,7 +3,7 @@ --source include/big_test.inc --source include/default_optimizer_switch.inc -SET SESSION STORAGE_ENGINE='InnoDB'; +SET SESSION DEFAULT_STORAGE_ENGINE='InnoDB'; set @save_optimizer_switch_for_selectivity_test=@@optimizer_switch; set optimizer_switch='extended_keys=on'; @@ -177,4 +177,4 @@ drop view v1; set use_stat_tables= @tmp_ust; set optimizer_use_condition_selectivity= @tmp_oucs; set @@global.histogram_size=@save_histogram_size; -SET SESSION STORAGE_ENGINE=DEFAULT; +SET SESSION DEFAULT_STORAGE_ENGINE=DEFAULT; diff --git a/mysql-test/main/sp_trans.result b/mysql-test/main/sp_trans.result index cee2a7e5188..58ef4ad15f7 100644 --- a/mysql-test/main/sp_trans.result +++ b/mysql-test/main/sp_trans.result @@ -557,22 +557,22 @@ f1 bug13575(f1) 3 ccc drop function bug13575| drop table t3| -SELECT @@GLOBAL.storage_engine INTO @old_engine| -SET @@GLOBAL.storage_engine=InnoDB| -SET @@SESSION.storage_engine=InnoDB| -SHOW GLOBAL VARIABLES LIKE 'storage_engine'| +SELECT @@GLOBAL.default_storage_engine INTO @old_engine| +SET @@GLOBAL.default_storage_engine=InnoDB| +SET @@SESSION.default_storage_engine=InnoDB| +SHOW GLOBAL VARIABLES LIKE 'default_storage_engine'| Variable_name Value -storage_engine InnoDB -SHOW SESSION VARIABLES LIKE 'storage_engine'| +default_storage_engine InnoDB +SHOW SESSION VARIABLES LIKE 'default_storage_engine'| Variable_name Value -storage_engine InnoDB +default_storage_engine InnoDB CREATE PROCEDURE bug11758414() BEGIN -SET @@GLOBAL.storage_engine="MyISAM"; -SET @@SESSION.storage_engine="MyISAM"; +SET @@GLOBAL.default_storage_engine="MyISAM"; +SET @@SESSION.default_storage_engine="MyISAM"; # show defaults at execution time / that setting them worked -SHOW GLOBAL VARIABLES LIKE 'storage_engine'; -SHOW SESSION VARIABLES LIKE 'storage_engine'; +SHOW GLOBAL VARIABLES LIKE 'default_storage_engine'; +SHOW SESSION VARIABLES LIKE 'default_storage_engine'; CREATE TABLE t1 (id int); CREATE TABLE t2 (id int) ENGINE=InnoDB; # show we're heeding the default (at run-time, not parse-time!) @@ -583,9 +583,9 @@ END; | CALL bug11758414| Variable_name Value -storage_engine MyISAM +default_storage_engine MyISAM Variable_name Value -storage_engine MyISAM +default_storage_engine MyISAM Table Create Table t1 CREATE TABLE `t1` ( `id` int(11) DEFAULT NULL @@ -594,15 +594,15 @@ Table Create Table t2 CREATE TABLE `t2` ( `id` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 -SHOW GLOBAL VARIABLES LIKE 'storage_engine'| +SHOW GLOBAL VARIABLES LIKE 'default_storage_engine'| Variable_name Value -storage_engine MyISAM -SHOW SESSION VARIABLES LIKE 'storage_engine'| +default_storage_engine MyISAM +SHOW SESSION VARIABLES LIKE 'default_storage_engine'| Variable_name Value -storage_engine MyISAM +default_storage_engine MyISAM DROP PROCEDURE bug11758414| DROP TABLE t1, t2| -SET @@GLOBAL.storage_engine=@old_engine| +SET @@GLOBAL.default_storage_engine=@old_engine| # # End of 5.1 tests # diff --git a/mysql-test/main/sp_trans.test b/mysql-test/main/sp_trans.test index 7d6faba9789..b39c13287ed 100644 --- a/mysql-test/main/sp_trans.test +++ b/mysql-test/main/sp_trans.test @@ -601,22 +601,22 @@ drop function bug13575| drop table t3| # -# BUG#11758414: Default storage_engine not honored when set +# BUG#11758414: Default default_storage_engine not honored when set # from within a stored procedure # -SELECT @@GLOBAL.storage_engine INTO @old_engine| -SET @@GLOBAL.storage_engine=InnoDB| -SET @@SESSION.storage_engine=InnoDB| +SELECT @@GLOBAL.default_storage_engine INTO @old_engine| +SET @@GLOBAL.default_storage_engine=InnoDB| +SET @@SESSION.default_storage_engine=InnoDB| # show defaults at define-time -SHOW GLOBAL VARIABLES LIKE 'storage_engine'| -SHOW SESSION VARIABLES LIKE 'storage_engine'| +SHOW GLOBAL VARIABLES LIKE 'default_storage_engine'| +SHOW SESSION VARIABLES LIKE 'default_storage_engine'| CREATE PROCEDURE bug11758414() BEGIN - SET @@GLOBAL.storage_engine="MyISAM"; - SET @@SESSION.storage_engine="MyISAM"; + SET @@GLOBAL.default_storage_engine="MyISAM"; + SET @@SESSION.default_storage_engine="MyISAM"; # show defaults at execution time / that setting them worked - SHOW GLOBAL VARIABLES LIKE 'storage_engine'; - SHOW SESSION VARIABLES LIKE 'storage_engine'; + SHOW GLOBAL VARIABLES LIKE 'default_storage_engine'; + SHOW SESSION VARIABLES LIKE 'default_storage_engine'; CREATE TABLE t1 (id int); CREATE TABLE t2 (id int) ENGINE=InnoDB; # show we're heeding the default (at run-time, not parse-time!) @@ -627,11 +627,11 @@ END; | CALL bug11758414| # show that changing defaults within SP stuck -SHOW GLOBAL VARIABLES LIKE 'storage_engine'| -SHOW SESSION VARIABLES LIKE 'storage_engine'| +SHOW GLOBAL VARIABLES LIKE 'default_storage_engine'| +SHOW SESSION VARIABLES LIKE 'default_storage_engine'| DROP PROCEDURE bug11758414| DROP TABLE t1, t2| -SET @@GLOBAL.storage_engine=@old_engine| +SET @@GLOBAL.default_storage_engine=@old_engine| --echo # --echo # End of 5.1 tests diff --git a/mysql-test/main/stat_tables_disabled.result b/mysql-test/main/stat_tables_disabled.result index c974bba5a4b..14be9535ea4 100644 --- a/mysql-test/main/stat_tables_disabled.result +++ b/mysql-test/main/stat_tables_disabled.result @@ -3,7 +3,7 @@ set @innodb_stats_persistent_sample_pages_save= @@innodb_stats_persistent_sample_pages; set global innodb_stats_persistent= 1; set global innodb_stats_persistent_sample_pages=100; -SET SESSION STORAGE_ENGINE='InnoDB'; +SET SESSION DEFAULT_STORAGE_ENGINE='InnoDB'; select @@global.use_stat_tables; @@global.use_stat_tables PREFERABLY @@ -73,7 +73,7 @@ set optimizer_switch=@save_optimizer_switch; DROP DATABASE dbt3_s001; use test; set use_stat_tables=@save_use_stat_tables; -SET SESSION STORAGE_ENGINE=DEFAULT; +SET SESSION DEFAULT_STORAGE_ENGINE=DEFAULT; set global innodb_stats_persistent= @innodb_stats_persistent_save; set global innodb_stats_persistent_sample_pages= @innodb_stats_persistent_sample_pages_save; diff --git a/mysql-test/main/stat_tables_disabled.test b/mysql-test/main/stat_tables_disabled.test index 427cf4874bc..e6b965afe34 100644 --- a/mysql-test/main/stat_tables_disabled.test +++ b/mysql-test/main/stat_tables_disabled.test @@ -6,7 +6,7 @@ set global innodb_stats_persistent= 1; set global innodb_stats_persistent_sample_pages=100; --source include/have_innodb.inc -SET SESSION STORAGE_ENGINE='InnoDB'; +SET SESSION DEFAULT_STORAGE_ENGINE='InnoDB'; select @@global.use_stat_tables; select @@session.use_stat_tables; @@ -82,7 +82,7 @@ use test; set use_stat_tables=@save_use_stat_tables; -SET SESSION STORAGE_ENGINE=DEFAULT; +SET SESSION DEFAULT_STORAGE_ENGINE=DEFAULT; set global innodb_stats_persistent= @innodb_stats_persistent_save; set global innodb_stats_persistent_sample_pages= diff --git a/mysql-test/main/stat_tables_innodb.result b/mysql-test/main/stat_tables_innodb.result index d504b531170..2975c8ba686 100644 --- a/mysql-test/main/stat_tables_innodb.result +++ b/mysql-test/main/stat_tables_innodb.result @@ -1,4 +1,4 @@ -SET SESSION STORAGE_ENGINE='InnoDB'; +SET SESSION DEFAULT_STORAGE_ENGINE='InnoDB'; set @save_optimizer_switch_for_stat_tables_test=@@optimizer_switch; set optimizer_switch='extended_keys=on'; set @innodb_stats_persistent_save= @@innodb_stats_persistent; @@ -926,4 +926,4 @@ set global innodb_stats_persistent= @innodb_stats_persistent_save; set global innodb_stats_persistent_sample_pages= @innodb_stats_persistent_sample_pages_save; set optimizer_switch=@save_optimizer_switch_for_stat_tables_test; -SET SESSION STORAGE_ENGINE=DEFAULT; +SET SESSION DEFAULT_STORAGE_ENGINE=DEFAULT; diff --git a/mysql-test/main/stat_tables_innodb.test b/mysql-test/main/stat_tables_innodb.test index 5a97ad89363..533f56387a2 100644 --- a/mysql-test/main/stat_tables_innodb.test +++ b/mysql-test/main/stat_tables_innodb.test @@ -1,6 +1,6 @@ --source include/have_innodb.inc -SET SESSION STORAGE_ENGINE='InnoDB'; +SET SESSION DEFAULT_STORAGE_ENGINE='InnoDB'; set @save_optimizer_switch_for_stat_tables_test=@@optimizer_switch; set optimizer_switch='extended_keys=on'; @@ -18,4 +18,4 @@ set global innodb_stats_persistent_sample_pages= set optimizer_switch=@save_optimizer_switch_for_stat_tables_test; -SET SESSION STORAGE_ENGINE=DEFAULT; +SET SESSION DEFAULT_STORAGE_ENGINE=DEFAULT; diff --git a/mysql-test/main/stat_tables_par.test b/mysql-test/main/stat_tables_par.test index 9d4038911ff..383ea38fed4 100644 --- a/mysql-test/main/stat_tables_par.test +++ b/mysql-test/main/stat_tables_par.test @@ -155,7 +155,7 @@ select * from mysql.index_stats where table_name='lineitem' set debug_sync='RESET'; let $innodb_storage_engine= 0; -if (`SELECT UPPER(@@storage_engine) = 'INNODB'`) +if (`SELECT UPPER(@@default_storage_engine) = 'INNODB'`) { let $innodb_storage_engine= 1; } diff --git a/mysql-test/main/stat_tables_par_innodb.result b/mysql-test/main/stat_tables_par_innodb.result index 54579aff990..c0b8bc378b6 100644 --- a/mysql-test/main/stat_tables_par_innodb.result +++ b/mysql-test/main/stat_tables_par_innodb.result @@ -1,4 +1,4 @@ -SET SESSION STORAGE_ENGINE='InnoDB'; +SET SESSION DEFAULT_STORAGE_ENGINE='InnoDB'; set @save_optimizer_switch_for_stat_tables_test=@@optimizer_switch; set optimizer_switch='extended_keys=on'; set @save_use_stat_tables=@@use_stat_tables; @@ -315,4 +315,4 @@ drop table t1; set global use_stat_tables=@save_global_use_stat_tables; set use_stat_tables=@save_use_stat_tables; set optimizer_switch=@save_optimizer_switch_for_stat_tables_test; -SET SESSION STORAGE_ENGINE=DEFAULT; +SET SESSION DEFAULT_STORAGE_ENGINE=DEFAULT; diff --git a/mysql-test/main/stat_tables_par_innodb.test b/mysql-test/main/stat_tables_par_innodb.test index fd5833e4aaf..69adeeb7dc4 100644 --- a/mysql-test/main/stat_tables_par_innodb.test +++ b/mysql-test/main/stat_tables_par_innodb.test @@ -1,6 +1,6 @@ --source include/have_innodb.inc -SET SESSION STORAGE_ENGINE='InnoDB'; +SET SESSION DEFAULT_STORAGE_ENGINE='InnoDB'; set @save_optimizer_switch_for_stat_tables_test=@@optimizer_switch; set optimizer_switch='extended_keys=on'; @@ -9,4 +9,4 @@ set optimizer_switch='extended_keys=on'; set optimizer_switch=@save_optimizer_switch_for_stat_tables_test; -SET SESSION STORAGE_ENGINE=DEFAULT; +SET SESSION DEFAULT_STORAGE_ENGINE=DEFAULT; diff --git a/mysql-test/main/sum_distinct-big.result b/mysql-test/main/sum_distinct-big.result index 13e3e62fed2..0556fd9a7c3 100644 --- a/mysql-test/main/sum_distinct-big.result +++ b/mysql-test/main/sum_distinct-big.result @@ -1,6 +1,6 @@ set @save_tmp_table_size=@@tmp_table_size; set @save_max_heap_table_size=@@max_heap_table_size; -set storage_engine=MYISAM; +set default_storage_engine=MYISAM; CREATE TABLE t1 (id INTEGER); CREATE TABLE t2 (id INTEGER); INSERT INTO t1 (id) VALUES (1), (1), (1),(1); diff --git a/mysql-test/main/sum_distinct-big.test b/mysql-test/main/sum_distinct-big.test index bc318bf624d..c51d6c31249 100644 --- a/mysql-test/main/sum_distinct-big.test +++ b/mysql-test/main/sum_distinct-big.test @@ -14,7 +14,7 @@ set @save_max_heap_table_size=@@max_heap_table_size; # filesort is used (see uniques.cc:merge_walk) # -set storage_engine=MYISAM; +set default_storage_engine=MYISAM; CREATE TABLE t1 (id INTEGER); CREATE TABLE t2 (id INTEGER); diff --git a/mysql-test/main/system_mysql_db_fix40123.result b/mysql-test/main/system_mysql_db_fix40123.result index bc235227b42..98bba6d48e8 100644 --- a/mysql-test/main/system_mysql_db_fix40123.result +++ b/mysql-test/main/system_mysql_db_fix40123.result @@ -1,5 +1,5 @@ use test; -set storage_engine=myisam; +set default_storage_engine=myisam; CREATE TABLE db ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, PRIMARY KEY Host (Host,Db,User), KEY User (User) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Database privileges'; Warnings: Warning 1280 Name 'Host' ignored for PRIMARY key. diff --git a/mysql-test/main/system_mysql_db_fix40123.test b/mysql-test/main/system_mysql_db_fix40123.test index 00747cd7ba0..2e7ebd151d2 100644 --- a/mysql-test/main/system_mysql_db_fix40123.test +++ b/mysql-test/main/system_mysql_db_fix40123.test @@ -24,7 +24,7 @@ use test; # create system tables as in mysql-4.1.23 # created by executing "./mysql_create_system_tables real ." -set storage_engine=myisam; +set default_storage_engine=myisam; CREATE TABLE db ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, PRIMARY KEY Host (Host,Db,User), KEY User (User) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Database privileges'; INSERT INTO db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y'); INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y'); diff --git a/mysql-test/main/system_mysql_db_fix50030.result b/mysql-test/main/system_mysql_db_fix50030.result index 842f9aca087..8b173988ed1 100644 --- a/mysql-test/main/system_mysql_db_fix50030.result +++ b/mysql-test/main/system_mysql_db_fix50030.result @@ -1,5 +1,5 @@ use test; -set storage_engine=myisam; +set default_storage_engine=myisam; CREATE TABLE db ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, PRIMARY KEY Host (Host,Db,User), KEY User (User) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Database privileges'; Warnings: Warning 1280 Name 'Host' ignored for PRIMARY key. diff --git a/mysql-test/main/system_mysql_db_fix50030.test b/mysql-test/main/system_mysql_db_fix50030.test index 085286637b0..77f1a97b1aa 100644 --- a/mysql-test/main/system_mysql_db_fix50030.test +++ b/mysql-test/main/system_mysql_db_fix50030.test @@ -24,7 +24,7 @@ use test; # create system tables as in mysql-5.0.30 # created by executing "./mysql_create_system_tables real ." -set storage_engine=myisam; +set default_storage_engine=myisam; CREATE TABLE db ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, PRIMARY KEY Host (Host,Db,User), KEY User (User) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Database privileges'; INSERT INTO db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N'); INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N'); diff --git a/mysql-test/main/unsafe_binlog_innodb.result b/mysql-test/main/unsafe_binlog_innodb.result index c917362af59..ced29926400 100644 --- a/mysql-test/main/unsafe_binlog_innodb.result +++ b/mysql-test/main/unsafe_binlog_innodb.result @@ -98,15 +98,15 @@ connect a,localhost,root,,; connect b,localhost,root,,; connect c,localhost,root,,; connect d,localhost,root,,; -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; connect e,localhost,root,,; connect f,localhost,root,,; connect g,localhost,root,,; -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; connect h,localhost,root,,; connect i,localhost,root,,; connect j,localhost,root,,; -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; connection a; create table t1(a int not null, b int, primary key(a)) engine = InnoDB; insert into t1 values (1,2),(5,3),(4,2); diff --git a/mysql-test/main/xtradb_mrr.result b/mysql-test/main/xtradb_mrr.result index 2f18a7c287f..34fd8300423 100644 --- a/mysql-test/main/xtradb_mrr.result +++ b/mysql-test/main/xtradb_mrr.result @@ -1,6 +1,6 @@ drop table if exists t1,t2,t3,t4; -set @save_storage_engine= @@storage_engine; -set storage_engine=InnoDB; +set @save_storage_engine= @@default_storage_engine; +set default_storage_engine=InnoDB; set @innodb_mrr_tmp=@@optimizer_switch; set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on'; create table t1(a int); @@ -296,7 +296,7 @@ NULL 7 0 NULL 9 0 NULL 9 0 drop table t1, t2; -set storage_engine= @save_storage_engine; +set default_storage_engine= @save_storage_engine; set @mrr_buffer_size_save= @@mrr_buffer_size; set mrr_buffer_size=64; Warnings: diff --git a/mysql-test/main/xtradb_mrr.test b/mysql-test/main/xtradb_mrr.test index 8dccd20796f..9de9b192b06 100644 --- a/mysql-test/main/xtradb_mrr.test +++ b/mysql-test/main/xtradb_mrr.test @@ -4,15 +4,15 @@ drop table if exists t1,t2,t3,t4; --enable_warnings -set @save_storage_engine= @@storage_engine; -set storage_engine=InnoDB; +set @save_storage_engine= @@default_storage_engine; +set default_storage_engine=InnoDB; set @innodb_mrr_tmp=@@optimizer_switch; set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on'; --source include/mrr_tests.inc -set storage_engine= @save_storage_engine; +set default_storage_engine= @save_storage_engine; # Try big rowid sizes set @mrr_buffer_size_save= @@mrr_buffer_size; |