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 | |
| 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.
260 files changed, 802 insertions, 768 deletions
diff --git a/mysql-test/include/column_compression_rpl.inc b/mysql-test/include/column_compression_rpl.inc index 7c8931a491f..3abf04a92ed 100644 --- a/mysql-test/include/column_compression_rpl.inc +++ b/mysql-test/include/column_compression_rpl.inc @@ -5,7 +5,7 @@ SET @saved_slave_type_conversions = @@slave_type_conversions; SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_NON_LOSSY'; --connection master -if (!$engine_type) {let $engine_type=`SELECT @@storage_engine`; let $engine_type2=`SELECT @@storage_engine`;} +if (!$engine_type) {let $engine_type=`SELECT @@default_storage_engine`; let $engine_type2=`SELECT @@default_storage_engine`;} --disable_warnings DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8,t9,t10; diff --git a/mysql-test/include/concurrent.inc b/mysql-test/include/concurrent.inc index 5a1f8c6eb89..5425f144d1d 100644 --- a/mysql-test/include/concurrent.inc +++ b/mysql-test/include/concurrent.inc @@ -58,7 +58,7 @@ GRANT USAGE ON test.* TO mysqltest@localhost; connect (thread1, localhost, mysqltest,,); connection thread1; --echo ** Set up table - eval SET SESSION STORAGE_ENGINE = $engine_type; + eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; 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"); @@ -148,7 +148,7 @@ drop table t1; #connect (thread1, localhost, mysqltest,,); connection thread1; --echo ** Set up table - eval SET SESSION STORAGE_ENGINE = $engine_type; + eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; 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"); @@ -237,7 +237,7 @@ drop table t1; #connect (thread1, localhost, mysqltest,,); connection thread1; --echo ** Set up table - eval SET SESSION STORAGE_ENGINE = $engine_type; + eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; create table t1 (a int not null, b int not null); insert into t1 values (1,1),(2,1),(3,1),(4,1); --echo ** Create ULL 'hello2' @@ -287,7 +287,7 @@ drop table t1; #connect (thread1, localhost, mysqltest,,); connection thread1; --echo ** Set up table - eval SET SESSION STORAGE_ENGINE = $engine_type; + eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; 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"); @@ -349,7 +349,7 @@ drop table t1; #connect (thread1, localhost, mysqltest,,); connection thread1; --echo ** Set up table - eval SET SESSION STORAGE_ENGINE = $engine_type; + eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; 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"); @@ -420,7 +420,7 @@ drop table t1; #connect (thread1, localhost, mysqltest,,); connection thread1; --echo ** Set up table - eval SET SESSION STORAGE_ENGINE = $engine_type; + eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; 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"); @@ -478,7 +478,7 @@ drop table t1; #connect (thread1, localhost, mysqltest,,); connection thread1; --echo ** Set up table - eval SET SESSION STORAGE_ENGINE = $engine_type; + eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; 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"); @@ -533,7 +533,7 @@ drop table t1; #connect (thread1, localhost, mysqltest,,); connection thread1; --echo ** Set up table - eval SET SESSION STORAGE_ENGINE = $engine_type; + eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; 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/include/ctype_common.inc b/mysql-test/include/ctype_common.inc index a39c25f2cc8..2b407fcb31a 100644 --- a/mysql-test/include/ctype_common.inc +++ b/mysql-test/include/ctype_common.inc @@ -8,7 +8,7 @@ # use SHOW FULL COLUMNS instead. # # Please surround all CREATE TABLE with --disable_warnings -# and --enable_warnings to be able to set storage_engine +# and --enable_warnings to be able to set default_storage_engine # without having to check if the hanlder exists. SET @safe_character_set_server= @@character_set_server; diff --git a/mysql-test/include/ctype_pad_all_engines.inc b/mysql-test/include/ctype_pad_all_engines.inc index 29371676a19..a031f84e74b 100644 --- a/mysql-test/include/ctype_pad_all_engines.inc +++ b/mysql-test/include/ctype_pad_all_engines.inc @@ -1,7 +1,7 @@ -SET STORAGE_ENGINE=MyISAM; +SET DEFAULT_STORAGE_ENGINE=MyISAM; --source include/ctype_pad.inc -SET STORAGE_ENGINE=HEAP; +SET DEFAULT_STORAGE_ENGINE=HEAP; --source include/ctype_pad.inc -SET STORAGE_ENGINE=Default; +SET DEFAULT_STORAGE_ENGINE=Default; diff --git a/mysql-test/include/deadlock.inc b/mysql-test/include/deadlock.inc index 7ac2a16fc44..b5ffd5f1cb5 100644 --- a/mysql-test/include/deadlock.inc +++ b/mysql-test/include/deadlock.inc @@ -132,7 +132,7 @@ drop table t1, t2; # Bug#25164 create table `a` as select * from `A` hangs # -set storage_engine=innodb; +set default_storage_engine=innodb; --disable_warnings drop table if exists a; @@ -149,6 +149,6 @@ drop table A; drop table if exists a; --enable_warnings -set storage_engine=default; +set default_storage_engine=default; --echo End of 5.0 tests. diff --git a/mysql-test/include/loaddata_autocom.inc b/mysql-test/include/loaddata_autocom.inc index 7b0c67d2ca8..8c38965f1c0 100644 --- a/mysql-test/include/loaddata_autocom.inc +++ b/mysql-test/include/loaddata_autocom.inc @@ -1,6 +1,6 @@ # Test if the engine does autocommit in LOAD DATA INFILE, or not -eval SET SESSION STORAGE_ENGINE = $engine_type; +eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; --disable_warnings drop table if exists t1; diff --git a/mysql-test/include/mix2.inc b/mysql-test/include/mix2.inc index ed06e436ead..8e72e7ad2f6 100644 --- a/mysql-test/include/mix2.inc +++ b/mysql-test/include/mix2.inc @@ -55,7 +55,7 @@ # Set the SESSION DEFAULT STORAGE ENGINE to a value <> storage engine # to be tested. This must not affect any CREATE TABLE statement, where # the storage engine is assigned explicitly, -eval SET SESSION STORAGE_ENGINE = $other_engine_type; +eval SET SESSION DEFAULT_STORAGE_ENGINE = $other_engine_type; # # Small basic test with ignore @@ -1457,8 +1457,8 @@ show variables like "innodb_thread_sleep_delay"; # Test varchar # -let $default=`select @@storage_engine`; -eval set storage_engine=$engine_type; +let $default=`select @@default_storage_engine`; +eval set default_storage_engine=$engine_type; source include/varchar.inc; # @@ -1479,7 +1479,7 @@ create table t1 (v varchar(65530) character set utf8); show create table t1; drop table t1; -eval set storage_engine=$default; +eval set default_storage_engine=$default; # InnoDB specific varchar tests eval create table t1 (v varchar(16384)) engine=$engine_type; @@ -2272,25 +2272,25 @@ drop table t1, t2, t3; # 3) CREATE ... SELECT connect (a,localhost,root,,); -eval SET SESSION STORAGE_ENGINE = $engine_type; +eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; connect (b,localhost,root,,); -eval SET SESSION STORAGE_ENGINE = $engine_type; +eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; connect (c,localhost,root,,); -eval SET SESSION STORAGE_ENGINE = $engine_type; +eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; connect (d,localhost,root,,); -eval SET SESSION STORAGE_ENGINE = $engine_type; +eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; connect (e,localhost,root,,); -eval SET SESSION STORAGE_ENGINE = $engine_type; +eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; connect (f,localhost,root,,); -eval SET SESSION STORAGE_ENGINE = $engine_type; +eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; connect (g,localhost,root,,); -eval SET SESSION STORAGE_ENGINE = $engine_type; +eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; connect (h,localhost,root,,); -eval SET SESSION STORAGE_ENGINE = $engine_type; +eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; connect (i,localhost,root,,); -eval SET SESSION STORAGE_ENGINE = $engine_type; +eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; connect (j,localhost,root,,); -eval SET SESSION STORAGE_ENGINE = $engine_type; +eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; connection a; create table t1(a int not null, b int, primary key(a)); insert into t1 values (1,2),(5,3),(4,2); diff --git a/mysql-test/include/partition_mrr.inc b/mysql-test/include/partition_mrr.inc index 4c285791ec7..d6df1058ff8 100644 --- a/mysql-test/include/partition_mrr.inc +++ b/mysql-test/include/partition_mrr.inc @@ -10,8 +10,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; -eval set storage_engine=$engine_type; +set @tmp=@@default_storage_engine; +eval set default_storage_engine=$engine_type; create table t3 ( ID bigint(20) NOT NULL AUTO_INCREMENT, @@ -27,7 +27,7 @@ create table t3 ( ); show create table t3; -set storage_engine= @tmp; +set default_storage_engine= @tmp; insert into t3 select A.a+10*B.a, diff --git a/mysql-test/include/query_cache.inc b/mysql-test/include/query_cache.inc index fcb9c2494d4..d41bc21b143 100644 --- a/mysql-test/include/query_cache.inc +++ b/mysql-test/include/query_cache.inc @@ -17,7 +17,7 @@ SET global query_cache_type=ON; SET local query_cache_type=ON; -eval SET SESSION STORAGE_ENGINE = $engine_type; +eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; # Initialise --disable_warnings @@ -120,7 +120,7 @@ drop table t3,t2,t1; # Establish connection1 connect (connection1,localhost,root,,); -eval SET SESSION STORAGE_ENGINE = $engine_type; +eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; SET @@autocommit=1; connection default; @@ -130,7 +130,7 @@ SHOW VARIABLES LIKE 'have_query_cache'; SET GLOBAL query_cache_size = 204800; flush status; SET @@autocommit=1; -eval SET SESSION STORAGE_ENGINE = $engine_type; +eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; eval CREATE TABLE t2 (s1 int, s2 varchar(1000), key(s1))$partitions_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/include/query_cache_partitions.inc b/mysql-test/include/query_cache_partitions.inc index c69356f907d..e06b161e03b 100644 --- a/mysql-test/include/query_cache_partitions.inc +++ b/mysql-test/include/query_cache_partitions.inc @@ -6,7 +6,7 @@ SET global query_cache_type=ON; SET local query_cache_type=ON; -eval SET SESSION STORAGE_ENGINE = $engine_type; +eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; # Initialise --disable_warnings diff --git a/mysql-test/include/read_many_rows.inc b/mysql-test/include/read_many_rows.inc index d40086b01df..7590f48af6c 100644 --- a/mysql-test/include/read_many_rows.inc +++ b/mysql-test/include/read_many_rows.inc @@ -19,7 +19,7 @@ # main code t/innodb-big.test --> include/read_many_rows.inc # -eval SET SESSION STORAGE_ENGINE = $engine_type; +eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; --disable_warnings DROP TABLE IF EXISTS t1, t2, t3, t4; diff --git a/mysql-test/include/rowid_order.inc b/mysql-test/include/rowid_order.inc index b05bad45cde..0dfe48e0b52 100644 --- a/mysql-test/include/rowid_order.inc +++ b/mysql-test/include/rowid_order.inc @@ -16,7 +16,7 @@ # main code went into include/rowid_order.inc # -eval SET SESSION STORAGE_ENGINE = $engine_type; +eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; --disable_warnings drop table if exists t1, t2, t3,t4; diff --git a/mysql-test/include/unsafe_binlog.inc b/mysql-test/include/unsafe_binlog.inc index 2fc2ad77bc9..824ee2a61d7 100644 --- a/mysql-test/include/unsafe_binlog.inc +++ b/mysql-test/include/unsafe_binlog.inc @@ -145,15 +145,15 @@ connect (a,localhost,root,,); connect (b,localhost,root,,); connect (c,localhost,root,,); connect (d,localhost,root,,); -eval SET SESSION STORAGE_ENGINE = $engine_type; +eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; connect (e,localhost,root,,); connect (f,localhost,root,,); connect (g,localhost,root,,); -eval SET SESSION STORAGE_ENGINE = $engine_type; +eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; connect (h,localhost,root,,); connect (i,localhost,root,,); connect (j,localhost,root,,); -eval SET SESSION STORAGE_ENGINE = $engine_type; +eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; connection a; eval create table t1(a int not null, b int, primary key(a)) engine = $engine_type; insert into t1 values (1,2),(5,3),(4,2); 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; diff --git a/mysql-test/suite/archive/archive.result b/mysql-test/suite/archive/archive.result index d294d3dfe58..656038f42b4 100644 --- a/mysql-test/suite/archive/archive.result +++ b/mysql-test/suite/archive/archive.result @@ -1,7 +1,7 @@ CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); call mtr.add_suppression("Table 't1' is marked as crashed and should be repaired"); DROP TABLE if exists t1,t2,t3,t4,t5,t6; -SET storage_engine=ARCHIVE; +SET default_storage_engine=ARCHIVE; CREATE TABLE t1 ( Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL, Varor_period smallint(4) unsigned DEFAULT '0' NOT NULL diff --git a/mysql-test/suite/archive/archive.test b/mysql-test/suite/archive/archive.test index 30f2766507e..2d184110a2d 100644 --- a/mysql-test/suite/archive/archive.test +++ b/mysql-test/suite/archive/archive.test @@ -11,7 +11,7 @@ call mtr.add_suppression("Table 't1' is marked as crashed and should be repaired DROP TABLE if exists t1,t2,t3,t4,t5,t6; --enable_warnings -SET storage_engine=ARCHIVE; +SET default_storage_engine=ARCHIVE; let $MYSQLD_DATADIR= `SELECT @@datadir`; CREATE TABLE t1 ( diff --git a/mysql-test/suite/archive/archive_gis.result b/mysql-test/suite/archive/archive_gis.result index 6e7a5a2c1ea..e24cad80702 100644 --- a/mysql-test/suite/archive/archive_gis.result +++ b/mysql-test/suite/archive/archive_gis.result @@ -1,4 +1,4 @@ -SET storage_engine=archive; +SET default_storage_engine=archive; DROP TABLE IF EXISTS t1, gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry; CREATE TABLE gis_point (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g POINT); CREATE TABLE gis_line (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g LINESTRING); diff --git a/mysql-test/suite/archive/archive_gis.test b/mysql-test/suite/archive/archive_gis.test index ffbad923173..9ee27ba9fbf 100644 --- a/mysql-test/suite/archive/archive_gis.test +++ b/mysql-test/suite/archive/archive_gis.test @@ -1,3 +1,3 @@ --source include/have_archive.inc -SET storage_engine=archive; +SET default_storage_engine=archive; --source include/gis_generic.inc diff --git a/mysql-test/suite/engines/rr_trx/include/rr_init.test b/mysql-test/suite/engines/rr_trx/include/rr_init.test index 05769bf70eb..7d08c4565e2 100644 --- a/mysql-test/suite/engines/rr_trx/include/rr_init.test +++ b/mysql-test/suite/engines/rr_trx/include/rr_init.test @@ -1,8 +1,8 @@ # # Specify storage engine to use. Variable $engine is set in wrapper test. # -eval SET @@storage_engine = $engine; -if (`SELECT @@storage_engine LIKE 'InnoDB' AND @@version LIKE '%6.%'`) +eval SET @@default_storage_engine = $engine; +if (`SELECT @@default_storage_engine LIKE 'InnoDB' AND @@version LIKE '%6.%'`) { # Need this due to Bug#43447 - Crash when executing SELECT ... LIMIT n FOR UPDATE query # Hopefully temporary... @@ -14,7 +14,7 @@ if (`SELECT @@storage_engine LIKE 'InnoDB' AND @@version LIKE '%6.%'`) } # Verify default storage engine. -SHOW VARIABLES LIKE 'storage_engine'; +SHOW VARIABLES LIKE 'default_storage_engine'; # Verify default isolation level SHOW VARIABLES LIKE 'tx_isolation'; diff --git a/mysql-test/suite/engines/rr_trx/r/init_innodb.result b/mysql-test/suite/engines/rr_trx/r/init_innodb.result index 6522adfd52b..292575a6610 100644 --- a/mysql-test/suite/engines/rr_trx/r/init_innodb.result +++ b/mysql-test/suite/engines/rr_trx/r/init_innodb.result @@ -1,5 +1,5 @@ -SET @@storage_engine = 'InnoDB'; -SHOW VARIABLES LIKE 'storage_engine'; +SET @@default_storage_engine = 'InnoDB'; +SHOW VARIABLES LIKE 'default_storage_engine'; Variable_name Value storage_engine InnoDB SHOW VARIABLES LIKE 'tx_isolation'; diff --git a/mysql-test/suite/gcol/r/gcol_csv.result b/mysql-test/suite/gcol/r/gcol_csv.result index 20708586d51..e07b72ba589 100644 --- a/mysql-test/suite/gcol/r/gcol_csv.result +++ b/mysql-test/suite/gcol/r/gcol_csv.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'CSV'; +SET @@session.default_storage_engine = 'CSV'; create table t1 (a int, b virtual int as (a+1)); ERROR HY000: 'Specified storage engine' is not yet supported for generated columns. create table t1 (a int not null); diff --git a/mysql-test/suite/gcol/r/gcol_falcon.result b/mysql-test/suite/gcol/r/gcol_falcon.result index 2eb558e6b69..8948539a245 100644 --- a/mysql-test/suite/gcol/r/gcol_falcon.result +++ b/mysql-test/suite/gcol/r/gcol_falcon.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'falcon'; +SET @@session.default_storage_engine = 'falcon'; create table t1 (a int, b virtual int as (a+1)); ERROR HY000: 'Specified storage engine' is not yet supported for generated columns. create table t1 (a int); diff --git a/mysql-test/suite/handler/aria.result b/mysql-test/suite/handler/aria.result index 1896e30f7d5..51283022588 100644 --- a/mysql-test/suite/handler/aria.result +++ b/mysql-test/suite/handler/aria.result @@ -1,4 +1,4 @@ -SET SESSION STORAGE_ENGINE = Aria; +SET SESSION DEFAULT_STORAGE_ENGINE = Aria; drop table if exists t1,t3,t4,t5; create table t1 (a int, b char(10), key a using btree (a), key b using btree (a,b)); insert into t1 values diff --git a/mysql-test/suite/handler/heap.result b/mysql-test/suite/handler/heap.result index 32d06b79604..bd8aff906fd 100644 --- a/mysql-test/suite/handler/heap.result +++ b/mysql-test/suite/handler/heap.result @@ -1,4 +1,4 @@ -SET SESSION STORAGE_ENGINE = MEMORY; +SET SESSION DEFAULT_STORAGE_ENGINE = MEMORY; drop table if exists t1,t3,t4,t5; create table t1 (a int, b char(10), key a using btree (a), key b using btree (a,b)); insert into t1 values diff --git a/mysql-test/suite/handler/init.inc b/mysql-test/suite/handler/init.inc index ff5b2218ed1..7418bbb116d 100644 --- a/mysql-test/suite/handler/init.inc +++ b/mysql-test/suite/handler/init.inc @@ -15,7 +15,7 @@ # -- source include/not_embedded.inc -eval SET SESSION STORAGE_ENGINE = $engine_type; +eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; let $other_handler_engine_type= MyISAM; --disable_warnings diff --git a/mysql-test/suite/handler/innodb.result b/mysql-test/suite/handler/innodb.result index a1b2b318911..9026f917245 100644 --- a/mysql-test/suite/handler/innodb.result +++ b/mysql-test/suite/handler/innodb.result @@ -1,4 +1,4 @@ -SET SESSION STORAGE_ENGINE = InnoDB; +SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; drop table if exists t1,t3,t4,t5; create table t1 (a int, b char(10), key a using btree (a), key b using btree (a,b)); insert into t1 values diff --git a/mysql-test/suite/handler/interface.result b/mysql-test/suite/handler/interface.result index 8c39b15b6c9..5dcb80d2b2f 100644 --- a/mysql-test/suite/handler/interface.result +++ b/mysql-test/suite/handler/interface.result @@ -1,6 +1,6 @@ drop table if exists t1,t3,t4,t5; drop database if exists test_test; -SET SESSION STORAGE_ENGINE = MyISAM; +SET SESSION DEFAULT_STORAGE_ENGINE = MyISAM; drop table if exists t1,t3,t4,t5; create table t1 (a int, b char(10), key a using btree (a), key b using btree (a,b)); insert into t1 values diff --git a/mysql-test/suite/handler/myisam.result b/mysql-test/suite/handler/myisam.result index 2c5f8c3bfde..4fb600050ee 100644 --- a/mysql-test/suite/handler/myisam.result +++ b/mysql-test/suite/handler/myisam.result @@ -1,4 +1,4 @@ -SET SESSION STORAGE_ENGINE = MyISAM; +SET SESSION DEFAULT_STORAGE_ENGINE = MyISAM; drop table if exists t1,t3,t4,t5; create table t1 (a int, b char(10), key a using btree (a), key b using btree (a,b)); insert into t1 values diff --git a/mysql-test/suite/heap/heap.result b/mysql-test/suite/heap/heap.result index e8d1341aa9b..5e6cfde8410 100644 --- a/mysql-test/suite/heap/heap.result +++ b/mysql-test/suite/heap/heap.result @@ -249,7 +249,7 @@ a 3 2 drop table t1; -set storage_engine=HEAP; +set default_storage_engine=HEAP; create table t1 (v varchar(10), c char(10), t varchar(50)); insert into t1 values('+ ', '+ ', '+ '); set @a=repeat(' ',20); @@ -662,7 +662,7 @@ select length(v) from t1 where v=repeat('a',65530); length(v) 65530 drop table t1; -set storage_engine=MyISAM; +set default_storage_engine=MyISAM; create table t1 (a bigint unsigned auto_increment primary key, b int, key (b, a)) engine=heap; insert t1 (b) values (1),(1),(1),(1),(1),(1),(1),(1); diff --git a/mysql-test/suite/heap/heap.test b/mysql-test/suite/heap/heap.test index 237685a6423..ef950da5484 100644 --- a/mysql-test/suite/heap/heap.test +++ b/mysql-test/suite/heap/heap.test @@ -201,8 +201,8 @@ drop table t1; # We can't use varchar.inc becasue heap doesn't support blob's # -let $default=`select @@storage_engine`; -set storage_engine=HEAP; +let $default=`select @@default_storage_engine`; +set default_storage_engine=HEAP; # # Simple basic test that endspace is saved @@ -412,7 +412,7 @@ drop table t1; # # Reset varchar test # -eval set storage_engine=$default; +eval set default_storage_engine=$default; # # Bug #8489: Strange auto_increment behaviour diff --git a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result index e2937fe2073..76dedbf2495 100644 --- a/mysql-test/suite/innodb/r/innodb.result +++ b/mysql-test/suite/innodb/r/innodb.result @@ -1718,7 +1718,7 @@ variable_value - @innodb_row_lock_time_max_orig SELECT variable_value - @innodb_row_lock_time_avg_orig FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_row_lock_time_avg'; variable_value - @innodb_row_lock_time_avg_orig 0 -set storage_engine=INNODB; +set default_storage_engine=INNODB; drop table if exists t1,t2,t3; --- Testing varchar --- --- Testing varchar --- diff --git a/mysql-test/suite/innodb/r/innodb_bug35220.result b/mysql-test/suite/innodb/r/innodb_bug35220.result index 195775f74c8..23c5b0cc2f7 100644 --- a/mysql-test/suite/innodb/r/innodb_bug35220.result +++ b/mysql-test/suite/innodb/r/innodb_bug35220.result @@ -1 +1 @@ -SET storage_engine=InnoDB; +SET default_storage_engine=InnoDB; diff --git a/mysql-test/suite/innodb/r/innodb_bug38231.result b/mysql-test/suite/innodb/r/innodb_bug38231.result index 0ecdc13b048..3108e32d1a6 100644 --- a/mysql-test/suite/innodb/r/innodb_bug38231.result +++ b/mysql-test/suite/innodb/r/innodb_bug38231.result @@ -1,2 +1,2 @@ -SET storage_engine=InnoDB; +SET default_storage_engine=InnoDB; connection default; diff --git a/mysql-test/suite/innodb/r/innodb_bug39438.result b/mysql-test/suite/innodb/r/innodb_bug39438.result index 195775f74c8..23c5b0cc2f7 100644 --- a/mysql-test/suite/innodb/r/innodb_bug39438.result +++ b/mysql-test/suite/innodb/r/innodb_bug39438.result @@ -1 +1 @@ -SET storage_engine=InnoDB; +SET default_storage_engine=InnoDB; diff --git a/mysql-test/suite/innodb/r/innodb_ctype_big5.result b/mysql-test/suite/innodb/r/innodb_ctype_big5.result index 3ff2eed2b25..e417b07a21a 100644 --- a/mysql-test/suite/innodb/r/innodb_ctype_big5.result +++ b/mysql-test/suite/innodb/r/innodb_ctype_big5.result @@ -1,4 +1,4 @@ -SET STORAGE_ENGINE=InnoDB; +SET DEFAULT_STORAGE_ENGINE=InnoDB; # # Start of 10.2 tests # diff --git a/mysql-test/suite/innodb/r/innodb_ctype_latin1.result b/mysql-test/suite/innodb/r/innodb_ctype_latin1.result index 5818964328f..b605b65dbfb 100644 --- a/mysql-test/suite/innodb/r/innodb_ctype_latin1.result +++ b/mysql-test/suite/innodb/r/innodb_ctype_latin1.result @@ -1,4 +1,4 @@ -SET STORAGE_ENGINE=InnoDB; +SET DEFAULT_STORAGE_ENGINE=InnoDB; # # Start of 10.2 tests # diff --git a/mysql-test/suite/innodb/r/innodb_ctype_utf8.result b/mysql-test/suite/innodb/r/innodb_ctype_utf8.result index 360a4192ee7..08f02aa01d4 100644 --- a/mysql-test/suite/innodb/r/innodb_ctype_utf8.result +++ b/mysql-test/suite/innodb/r/innodb_ctype_utf8.result @@ -1,4 +1,4 @@ -SET STORAGE_ENGINE=InnoDB; +SET DEFAULT_STORAGE_ENGINE=InnoDB; # # Start of 10.2 tests # diff --git a/mysql-test/suite/innodb/r/innodb_gis.result b/mysql-test/suite/innodb/r/innodb_gis.result index 162219cc6ac..90fc5be1e73 100644 --- a/mysql-test/suite/innodb/r/innodb_gis.result +++ b/mysql-test/suite/innodb/r/innodb_gis.result @@ -1,4 +1,4 @@ -SET storage_engine=innodb; +SET default_storage_engine=innodb; DROP TABLE IF EXISTS t1, gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry; CREATE TABLE gis_point (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g POINT); CREATE TABLE gis_line (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g LINESTRING); diff --git a/mysql-test/suite/innodb/r/innodb_trx_weight.result b/mysql-test/suite/innodb/r/innodb_trx_weight.result index 195775f74c8..23c5b0cc2f7 100644 --- a/mysql-test/suite/innodb/r/innodb_trx_weight.result +++ b/mysql-test/suite/innodb/r/innodb_trx_weight.result @@ -1 +1 @@ -SET storage_engine=InnoDB; +SET default_storage_engine=InnoDB; diff --git a/mysql-test/suite/innodb/t/innodb-mdev7046.test b/mysql-test/suite/innodb/t/innodb-mdev7046.test index 27c140689c1..a8c8b7da2db 100644 --- a/mysql-test/suite/innodb/t/innodb-mdev7046.test +++ b/mysql-test/suite/innodb/t/innodb-mdev7046.test @@ -35,7 +35,7 @@ drop database test; create database test; use test; -SET @@session.storage_engine=MYISAM; +SET @@session.default_storage_engine=MYISAM; --error 0,1,1103 CREATE TABLE t1(id INT,purchased DATE)PARTITION BY RANGE(YEAR(purchased)) SUBPARTITION BY HASH(TO_DAYS(purchased)) SUBPARTITIONS 2 (PARTITION p0 VALUES LESS THAN MAXVALUE (SUBPARTITION sp0 DATA DIRECTORY='/tmp/not-existing' INDEX DIRECTORY='/tmp/not-existing',SUBPARTITION sp1)); drop table if exists t1; diff --git a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test index ab12cac5ea1..6fd2cdc74d2 100644 --- a/mysql-test/suite/innodb/t/innodb.test +++ b/mysql-test/suite/innodb/t/innodb.test @@ -1339,8 +1339,8 @@ SELECT variable_value - @innodb_row_lock_time_avg_orig FROM information_schema.g # Test varchar # -let $default=`select @@storage_engine`; -set storage_engine=INNODB; +let $default=`select @@default_storage_engine`; +set default_storage_engine=INNODB; source include/varchar.inc; # diff --git a/mysql-test/suite/innodb/t/innodb_bug35220.test b/mysql-test/suite/innodb/t/innodb_bug35220.test index 29c432fe987..8ad6b3070c3 100644 --- a/mysql-test/suite/innodb/t/innodb_bug35220.test +++ b/mysql-test/suite/innodb/t/innodb_bug35220.test @@ -4,7 +4,7 @@ # http://bugs.mysql.com/35220 # -SET storage_engine=InnoDB; +SET default_storage_engine=InnoDB; # we care only that the following SQL commands do not produce errors -- disable_query_log diff --git a/mysql-test/suite/innodb/t/innodb_bug38231.test b/mysql-test/suite/innodb/t/innodb_bug38231.test index ba4e1c62e06..0c139c338c4 100644 --- a/mysql-test/suite/innodb/t/innodb_bug38231.test +++ b/mysql-test/suite/innodb/t/innodb_bug38231.test @@ -9,7 +9,7 @@ # preceded by --send -- source include/not_embedded.inc -SET storage_engine=InnoDB; +SET default_storage_engine=InnoDB; # we care only that the following SQL commands do not crash the server -- disable_query_log diff --git a/mysql-test/suite/innodb/t/innodb_bug39438.test b/mysql-test/suite/innodb/t/innodb_bug39438.test index 3a838da8419..635d65f045b 100644 --- a/mysql-test/suite/innodb/t/innodb_bug39438.test +++ b/mysql-test/suite/innodb/t/innodb_bug39438.test @@ -8,7 +8,7 @@ # works with innodb_file_per_table. # -SET storage_engine=InnoDB; +SET default_storage_engine=InnoDB; # we care only that the following SQL commands do not crash the server -- disable_query_log diff --git a/mysql-test/suite/innodb/t/innodb_ctype_big5.test b/mysql-test/suite/innodb/t/innodb_ctype_big5.test index 684a97983e5..551d6add54b 100644 --- a/mysql-test/suite/innodb/t/innodb_ctype_big5.test +++ b/mysql-test/suite/innodb/t/innodb_ctype_big5.test @@ -1,7 +1,7 @@ --source include/have_innodb.inc --source include/have_big5.inc -SET STORAGE_ENGINE=InnoDB; +SET DEFAULT_STORAGE_ENGINE=InnoDB; --echo # --echo # Start of 10.2 tests diff --git a/mysql-test/suite/innodb/t/innodb_ctype_latin1.test b/mysql-test/suite/innodb/t/innodb_ctype_latin1.test index 0f88ae3212d..1eb9864f3b9 100644 --- a/mysql-test/suite/innodb/t/innodb_ctype_latin1.test +++ b/mysql-test/suite/innodb/t/innodb_ctype_latin1.test @@ -1,6 +1,6 @@ --source include/have_innodb.inc -SET STORAGE_ENGINE=InnoDB; +SET DEFAULT_STORAGE_ENGINE=InnoDB; --echo # --echo # Start of 10.2 tests diff --git a/mysql-test/suite/innodb/t/innodb_ctype_utf8.test b/mysql-test/suite/innodb/t/innodb_ctype_utf8.test index 105f771d8b3..c3abaa99731 100644 --- a/mysql-test/suite/innodb/t/innodb_ctype_utf8.test +++ b/mysql-test/suite/innodb/t/innodb_ctype_utf8.test @@ -1,6 +1,6 @@ --source include/have_innodb.inc -SET STORAGE_ENGINE=InnoDB; +SET DEFAULT_STORAGE_ENGINE=InnoDB; --echo # --echo # Start of 10.2 tests diff --git a/mysql-test/suite/innodb/t/innodb_gis.test b/mysql-test/suite/innodb/t/innodb_gis.test index cb04c15f0b6..c895d0a2af2 100644 --- a/mysql-test/suite/innodb/t/innodb_gis.test +++ b/mysql-test/suite/innodb/t/innodb_gis.test @@ -1,5 +1,5 @@ --source include/have_innodb.inc -SET storage_engine=innodb; +SET default_storage_engine=innodb; --source include/gis_generic.inc --source include/gis_keys.inc diff --git a/mysql-test/suite/innodb/t/innodb_information_schema.test b/mysql-test/suite/innodb/t/innodb_information_schema.test index da7ee016f29..395fa779773 100644 --- a/mysql-test/suite/innodb/t/innodb_information_schema.test +++ b/mysql-test/suite/innodb/t/innodb_information_schema.test @@ -15,7 +15,7 @@ -- disable_query_log -- disable_result_log -SET storage_engine=InnoDB; +SET default_storage_engine=InnoDB; -- disable_warnings DROP TABLE IF EXISTS t_min, t_max; diff --git a/mysql-test/suite/innodb/t/innodb_trx_weight.test b/mysql-test/suite/innodb/t/innodb_trx_weight.test index 8af311a532e..8dc23e99585 100644 --- a/mysql-test/suite/innodb/t/innodb_trx_weight.test +++ b/mysql-test/suite/innodb/t/innodb_trx_weight.test @@ -8,7 +8,7 @@ -- source include/have_innodb.inc -SET storage_engine=InnoDB; +SET default_storage_engine=InnoDB; # we do not really care about what gets printed, we are only # interested in getting the deadlock resolved according to our diff --git a/mysql-test/suite/maria/icp.result b/mysql-test/suite/maria/icp.result index ac51c5f6607..8dab1991b2e 100644 --- a/mysql-test/suite/maria/icp.result +++ b/mysql-test/suite/maria/icp.result @@ -1,5 +1,5 @@ -set @save_storage_engine= @@storage_engine; -set storage_engine=Maria; +set @save_storage_engine= @@default_storage_engine; +set default_storage_engine=Maria; set @maria_icp_tmp=@@optimizer_switch; set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on'; # @@ -903,5 +903,5 @@ c1 c2 aa x a y DROP TABLE t1; -set storage_engine= @save_storage_engine; +set default_storage_engine= @save_storage_engine; set optimizer_switch=@maria_icp_tmp; diff --git a/mysql-test/suite/maria/icp.test b/mysql-test/suite/maria/icp.test index 83d770dd8fd..0bcb3bccfe2 100644 --- a/mysql-test/suite/maria/icp.test +++ b/mysql-test/suite/maria/icp.test @@ -5,14 +5,14 @@ --source include/have_maria.inc --source include/default_optimizer_switch.inc -set @save_storage_engine= @@storage_engine; -set storage_engine=Maria; +set @save_storage_engine= @@default_storage_engine; +set default_storage_engine=Maria; set @maria_icp_tmp=@@optimizer_switch; set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on'; --source include/icp_tests.inc -set storage_engine= @save_storage_engine; +set default_storage_engine= @save_storage_engine; set optimizer_switch=@maria_icp_tmp; diff --git a/mysql-test/suite/maria/maria-big.result b/mysql-test/suite/maria/maria-big.result index f7f7d3d7525..f4fd4b65dc8 100644 --- a/mysql-test/suite/maria/maria-big.result +++ b/mysql-test/suite/maria/maria-big.result @@ -1,7 +1,7 @@ set global max_allowed_packet=400000000; connect root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK; connection root; -set storage_engine=aria; +set default_storage_engine=aria; affected rows: 0 drop table if exists t1, t2; affected rows: 0 diff --git a/mysql-test/suite/maria/maria-big.test b/mysql-test/suite/maria/maria-big.test index 6dc56756cf7..33a211b53bf 100644 --- a/mysql-test/suite/maria/maria-big.test +++ b/mysql-test/suite/maria/maria-big.test @@ -9,7 +9,7 @@ connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); connection root; enable_info; -set storage_engine=aria; +set default_storage_engine=aria; disable_warnings; drop table if exists t1, t2; enable_warnings; diff --git a/mysql-test/suite/maria/maria-connect.result b/mysql-test/suite/maria/maria-connect.result index b731bb4e1d0..1d9cf2ab97b 100644 --- a/mysql-test/suite/maria/maria-connect.result +++ b/mysql-test/suite/maria/maria-connect.result @@ -1,5 +1,5 @@ -set global storage_engine=aria; -set session storage_engine=aria; +set global default_storage_engine=aria; +set session default_storage_engine=aria; drop table if exists t1; SET SQL_WARNINGS=1; RESET MASTER; diff --git a/mysql-test/suite/maria/maria-connect.test b/mysql-test/suite/maria/maria-connect.test index a1e9bbce4f2..8df305d47eb 100644 --- a/mysql-test/suite/maria/maria-connect.test +++ b/mysql-test/suite/maria/maria-connect.test @@ -8,9 +8,9 @@ let $start_pos= `select @binlog_start_pos`; -let $default=`select @@global.storage_engine`; -set global storage_engine=aria; -set session storage_engine=aria; +let $default=`select @@global.default_storage_engine`; +set global default_storage_engine=aria; +set session default_storage_engine=aria; # Initialise --disable_warnings @@ -40,7 +40,7 @@ set binlog_format=default; --disable_result_log --disable_query_log -eval set global storage_engine=$default; +eval set global default_storage_engine=$default; set global aria_log_file_size=default; --enable_result_log --enable_query_log diff --git a/mysql-test/suite/maria/maria-gis-rtree-dynamic.result b/mysql-test/suite/maria/maria-gis-rtree-dynamic.result index 2f8c1b9408c..dad74e3767f 100644 --- a/mysql-test/suite/maria/maria-gis-rtree-dynamic.result +++ b/mysql-test/suite/maria/maria-gis-rtree-dynamic.result @@ -1,4 +1,4 @@ -set storage_engine=aria; +set default_storage_engine=aria; DROP TABLE IF EXISTS t1, t2; CREATE TABLE t1 ( fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY, diff --git a/mysql-test/suite/maria/maria-gis-rtree-dynamic.test b/mysql-test/suite/maria/maria-gis-rtree-dynamic.test index 473f787db53..8dd1d04d539 100644 --- a/mysql-test/suite/maria/maria-gis-rtree-dynamic.test +++ b/mysql-test/suite/maria/maria-gis-rtree-dynamic.test @@ -1,7 +1,7 @@ -- source include/have_maria.inc -- source include/have_geometry.inc -set storage_engine=aria; +set default_storage_engine=aria; # # test of rtree (using with spatial data) diff --git a/mysql-test/suite/maria/maria-gis-rtree-trans.result b/mysql-test/suite/maria/maria-gis-rtree-trans.result index 1c0d9e756a4..e118db697b2 100644 --- a/mysql-test/suite/maria/maria-gis-rtree-trans.result +++ b/mysql-test/suite/maria/maria-gis-rtree-trans.result @@ -1,4 +1,4 @@ -set storage_engine=aria; +set default_storage_engine=aria; DROP TABLE IF EXISTS t1, t2; CREATE TABLE t1 ( fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY, diff --git a/mysql-test/suite/maria/maria-gis-rtree-trans.test b/mysql-test/suite/maria/maria-gis-rtree-trans.test index 84678b68693..ab0203dfc6f 100644 --- a/mysql-test/suite/maria/maria-gis-rtree-trans.test +++ b/mysql-test/suite/maria/maria-gis-rtree-trans.test @@ -4,7 +4,7 @@ -- source include/have_maria.inc -- source include/have_geometry.inc -set storage_engine=aria; +set default_storage_engine=aria; # # test of rtree (using with spatial data) diff --git a/mysql-test/suite/maria/maria-gis-rtree.result b/mysql-test/suite/maria/maria-gis-rtree.result index e39430a2efb..9267556bc4b 100644 --- a/mysql-test/suite/maria/maria-gis-rtree.result +++ b/mysql-test/suite/maria/maria-gis-rtree.result @@ -1,4 +1,4 @@ -set storage_engine=aria; +set default_storage_engine=aria; DROP TABLE IF EXISTS t1, t2; CREATE TABLE t1 ( fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY, diff --git a/mysql-test/suite/maria/maria-gis-rtree.test b/mysql-test/suite/maria/maria-gis-rtree.test index 5c68e570fca..6c82108ecb0 100644 --- a/mysql-test/suite/maria/maria-gis-rtree.test +++ b/mysql-test/suite/maria/maria-gis-rtree.test @@ -1,7 +1,7 @@ -- source include/have_maria.inc -- source include/have_geometry.inc -set storage_engine=aria; +set default_storage_engine=aria; # # test of rtree (using with spatial data) diff --git a/mysql-test/suite/maria/maria-partitioning.result b/mysql-test/suite/maria/maria-partitioning.result index ad5de7952c7..1ef54bde3c8 100644 --- a/mysql-test/suite/maria/maria-partitioning.result +++ b/mysql-test/suite/maria/maria-partitioning.result @@ -1,5 +1,5 @@ -set global storage_engine=aria; -set session storage_engine=aria; +set global default_storage_engine=aria; +set session default_storage_engine=aria; DROP TABLE if exists t1,t2; Warnings: Note 1051 Unknown table 'test.t1' diff --git a/mysql-test/suite/maria/maria-partitioning.test b/mysql-test/suite/maria/maria-partitioning.test index 446cfed770b..6856d5a7157 100644 --- a/mysql-test/suite/maria/maria-partitioning.test +++ b/mysql-test/suite/maria/maria-partitioning.test @@ -5,10 +5,10 @@ --source include/have_maria.inc --source include/have_partition.inc -let $default_engine=`select @@global.storage_engine`; +let $default_engine=`select @@global.default_storage_engine`; let $default_checksum=`select @@global.aria_page_checksum`; -set global storage_engine=aria; -set session storage_engine=aria; +set global default_storage_engine=aria; +set session default_storage_engine=aria; # # Test outer join const propagation @@ -46,6 +46,6 @@ drop table t1; # Set defaults back --disable_result_log --disable_query_log -eval set global storage_engine=$default_engine; +eval set global default_storage_engine=$default_engine; --enable_result_log --enable_query_log diff --git a/mysql-test/suite/maria/maria-purge.result b/mysql-test/suite/maria/maria-purge.result index 53208aee990..71070cba7ff 100644 --- a/mysql-test/suite/maria/maria-purge.result +++ b/mysql-test/suite/maria/maria-purge.result @@ -4,8 +4,8 @@ connection default; connection admin; * shut down mysqld, removed logs, restarted it connection default; -set global storage_engine=aria; -set session storage_engine=aria; +set global default_storage_engine=aria; +set session default_storage_engine=aria; set global aria_log_file_size=4294959104; drop table if exists t1,t2; SET SQL_WARNINGS=1; diff --git a/mysql-test/suite/maria/maria-purge.test b/mysql-test/suite/maria/maria-purge.test index ad41fa0f5d0..7d799d9e2a9 100644 --- a/mysql-test/suite/maria/maria-purge.test +++ b/mysql-test/suite/maria/maria-purge.test @@ -15,9 +15,9 @@ connection default; # practice) -- source include/maria_empty_logs.inc -let $default=`select @@global.storage_engine`; -set global storage_engine=aria; -set session storage_engine=aria; +let $default=`select @@global.default_storage_engine`; +set global default_storage_engine=aria; +set session default_storage_engine=aria; let $def_logsize=`select @@global.aria_log_file_size`; let $def_checkinterval=`select @@global.aria_checkpoint_interval`; @@ -111,7 +111,7 @@ drop table t1, t2; --disable_result_log --disable_query_log set global aria_log_purge_type=immediate; -eval set global storage_engine=$default; +eval set global default_storage_engine=$default; eval set global aria_log_file_size=$def_logsize; eval set global aria_checkpoint_interval=$def_checkinterval; --enable_result_log diff --git a/mysql-test/suite/maria/maria-ucs2.result b/mysql-test/suite/maria/maria-ucs2.result index 83eaf88e660..f3ca03a6a25 100644 --- a/mysql-test/suite/maria/maria-ucs2.result +++ b/mysql-test/suite/maria/maria-ucs2.result @@ -1,8 +1,8 @@ select * from INFORMATION_SCHEMA.ENGINES where ENGINE="ARIA"; ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS Aria YES Crash-safe tables with MyISAM heritage. Used for internal temporary tables and privilege tables NO NO NO -set global storage_engine=aria; -set session storage_engine=aria; +set global default_storage_engine=aria; +set session default_storage_engine=aria; drop table if exists t1; SET SQL_WARNINGS=1; CREATE TABLE t1 ( a VARCHAR(800),KEY(a) ) diff --git a/mysql-test/suite/maria/maria-ucs2.test b/mysql-test/suite/maria/maria-ucs2.test index 7dab000a1c9..742de596e92 100644 --- a/mysql-test/suite/maria/maria-ucs2.test +++ b/mysql-test/suite/maria/maria-ucs2.test @@ -3,9 +3,9 @@ select * from INFORMATION_SCHEMA.ENGINES where ENGINE="ARIA"; -let $default_engine=`select @@global.storage_engine`; -set global storage_engine=aria; -set session storage_engine=aria; +let $default_engine=`select @@global.default_storage_engine`; +set global default_storage_engine=aria; +set session default_storage_engine=aria; # Initialise --disable_warnings @@ -47,6 +47,6 @@ DROP TABLE t1; --disable_result_log --disable_query_log -eval set global storage_engine=$default_engine; +eval set global default_storage_engine=$default_engine; --enable_result_log --enable_query_log diff --git a/mysql-test/suite/maria/maria.result b/mysql-test/suite/maria/maria.result index 9b0307d4968..eaa4fa568a5 100644 --- a/mysql-test/suite/maria/maria.result +++ b/mysql-test/suite/maria/maria.result @@ -2,8 +2,8 @@ call mtr.add_suppression("Can't find record in '.*'"); select * from INFORMATION_SCHEMA.ENGINES where ENGINE="ARIA"; ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS Aria YES Crash-safe tables with MyISAM heritage. Used for internal temporary tables and privilege tables NO NO NO -set global storage_engine=aria; -set session storage_engine=aria; +set global default_storage_engine=aria; +set session default_storage_engine=aria; set global aria_page_checksum=0; set global aria_log_file_size=4294959104; drop table if exists t1,t2; diff --git a/mysql-test/suite/maria/maria.test b/mysql-test/suite/maria/maria.test index 920443d4338..c940fc66bd4 100644 --- a/mysql-test/suite/maria/maria.test +++ b/mysql-test/suite/maria/maria.test @@ -10,10 +10,10 @@ call mtr.add_suppression("Can't find record in '.*'"); select * from INFORMATION_SCHEMA.ENGINES where ENGINE="ARIA"; -let $default_engine=`select @@global.storage_engine`; +let $default_engine=`select @@global.default_storage_engine`; let $default_checksum=`select @@global.aria_page_checksum`; -set global storage_engine=aria; -set session storage_engine=aria; +set global default_storage_engine=aria; +set session default_storage_engine=aria; set global aria_page_checksum=0; let $default_log_file_size=`select @@global.aria_log_file_size`; set global aria_log_file_size=4294959104; @@ -2094,7 +2094,7 @@ drop table t1; # Set defaults back --disable_result_log --disable_query_log -eval set global storage_engine=$default_engine, +eval set global default_storage_engine=$default_engine, aria_page_checksum=$default_checksum, aria_log_file_size=$default_log_file_size; --enable_result_log diff --git a/mysql-test/suite/maria/maria3.result b/mysql-test/suite/maria/maria3.result index 3c0b8f28800..f8ec749bfdc 100644 --- a/mysql-test/suite/maria/maria3.result +++ b/mysql-test/suite/maria/maria3.result @@ -1,8 +1,8 @@ select * from INFORMATION_SCHEMA.ENGINES where ENGINE="ARIA"; ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS Aria YES Crash-safe tables with MyISAM heritage. Used for internal temporary tables and privilege tables NO NO NO -set global storage_engine=aria; -set session storage_engine=aria; +set global default_storage_engine=aria; +set session default_storage_engine=aria; set global aria_page_checksum=0; set global aria_log_file_size=4294959104; drop table if exists t1,t2; diff --git a/mysql-test/suite/maria/maria3.test b/mysql-test/suite/maria/maria3.test index fd0d5c67a57..bf533228300 100644 --- a/mysql-test/suite/maria/maria3.test +++ b/mysql-test/suite/maria/maria3.test @@ -2,10 +2,10 @@ select * from INFORMATION_SCHEMA.ENGINES where ENGINE="ARIA"; -let $default_engine=`select @@global.storage_engine`; +let $default_engine=`select @@global.default_storage_engine`; let $default_checksum=`select @@global.aria_page_checksum`; -set global storage_engine=aria; -set session storage_engine=aria; +set global default_storage_engine=aria; +set session default_storage_engine=aria; set global aria_page_checksum=0; let $default_log_file_size=`select @@global.aria_log_file_size`; set global aria_log_file_size=4294959104; @@ -561,7 +561,7 @@ drop table t1; --disable_result_log --disable_query_log -eval set global storage_engine=$default_engine, +eval set global default_storage_engine=$default_engine, aria_page_checksum=$default_checksum, aria_log_file_size=$default_log_file_size; --enable_result_log diff --git a/mysql-test/suite/maria/maria_notembedded.result b/mysql-test/suite/maria/maria_notembedded.result index a717782830d..0e90ebced66 100644 --- a/mysql-test/suite/maria/maria_notembedded.result +++ b/mysql-test/suite/maria/maria_notembedded.result @@ -1,5 +1,5 @@ call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction"); -set session storage_engine=aria; +set session default_storage_engine=aria; create table t1 (a int) row_format=page; insert delayed into t1 values(1); ERROR HY000: DELAYED option not supported for table 't1' diff --git a/mysql-test/suite/maria/maria_notembedded.test b/mysql-test/suite/maria/maria_notembedded.test index 29f15e81013..70c04073416 100644 --- a/mysql-test/suite/maria/maria_notembedded.test +++ b/mysql-test/suite/maria/maria_notembedded.test @@ -5,8 +5,8 @@ call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction"); -let $default_engine=`select @@session.storage_engine`; -set session storage_engine=aria; +let $default_engine=`select @@session.default_storage_engine`; +set session default_storage_engine=aria; # Verify that INSERT DELAYED is disabled only for transactional tables # ("embedded" server translates them to plain INSERT) @@ -96,6 +96,6 @@ drop table t1; --disable_result_log --disable_query_log -eval set session storage_engine=$default_engine; +eval set session default_storage_engine=$default_engine; --enable_result_log --enable_query_log diff --git a/mysql-test/suite/maria/maria_partition.result b/mysql-test/suite/maria/maria_partition.result index 1c4f0fbaf05..f544ddd4927 100644 --- a/mysql-test/suite/maria/maria_partition.result +++ b/mysql-test/suite/maria/maria_partition.result @@ -1,5 +1,5 @@ -set global storage_engine=aria; -set session storage_engine=aria; +set global default_storage_engine=aria; +set session default_storage_engine=aria; set global aria_page_checksum=0; drop table if exists t1,t2; drop view if exists v1; diff --git a/mysql-test/suite/maria/maria_partition.test b/mysql-test/suite/maria/maria_partition.test index ca2651bcdc3..c515b6e717a 100644 --- a/mysql-test/suite/maria/maria_partition.test +++ b/mysql-test/suite/maria/maria_partition.test @@ -3,10 +3,10 @@ --source include/have_partition.inc -- source include/have_maria.inc -let $default_engine=`select @@global.storage_engine`; +let $default_engine=`select @@global.default_storage_engine`; let $default_checksum=`select @@global.aria_page_checksum`; -set global storage_engine=aria; -set session storage_engine=aria; +set global default_storage_engine=aria; +set session default_storage_engine=aria; set global aria_page_checksum=0; # Initialise @@ -74,7 +74,7 @@ drop view v1; # Set defaults back --disable_result_log --disable_query_log -eval set global storage_engine=$default_engine, aria_page_checksum=$default_checksum; +eval set global default_storage_engine=$default_engine, aria_page_checksum=$default_checksum; set global aria_log_file_size=default; --enable_result_log --enable_query_log diff --git a/mysql-test/suite/maria/mrr.result b/mysql-test/suite/maria/mrr.result index 2ebf10cf1af..40c39a2abe8 100644 --- a/mysql-test/suite/maria/mrr.result +++ b/mysql-test/suite/maria/mrr.result @@ -2,8 +2,8 @@ drop table if exists t1,t2,t3,t4; set @maria_mrr_tmp=@@optimizer_switch; set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on'; set @mrr_buffer_size_save= @@mrr_buffer_size; -set @save_storage_engine= @@storage_engine; -set storage_engine=aria; +set @save_storage_engine= @@default_storage_engine; +set default_storage_engine=aria; create table t1(a int); show create table t1; Table Create Table @@ -297,7 +297,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= @mrr_buffer_size_save; # # Crash in quick_range_seq_next() in maria-5.3-dsmrr-cpk with join_cache_level = {8,1} diff --git a/mysql-test/suite/maria/mrr.test b/mysql-test/suite/maria/mrr.test index f3addd6c0f5..45d75a9d795 100644 --- a/mysql-test/suite/maria/mrr.test +++ b/mysql-test/suite/maria/mrr.test @@ -12,11 +12,11 @@ set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on'; set @mrr_buffer_size_save= @@mrr_buffer_size; -set @save_storage_engine= @@storage_engine; -set storage_engine=aria; +set @save_storage_engine= @@default_storage_engine; +set default_storage_engine=aria; --source include/mrr_tests.inc -set storage_engine= @save_storage_engine; +set default_storage_engine= @save_storage_engine; set @@mrr_buffer_size= @mrr_buffer_size_save; diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result index 11f915aaf8e..b92b42acf4a 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result @@ -1,4 +1,4 @@ -set storage_engine=innodb; +set default_storage_engine=innodb; set @save_time_zone= @@time_zone; set time_zone='+03:00'; SET @saved_dbug = @@SESSION.debug_dbug; diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test index 02d0ab6d566..f0ce06da315 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test +++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test @@ -3,7 +3,7 @@ --source include/have_debug.inc --source include/have_innodb.inc -set storage_engine=innodb; +set default_storage_engine=innodb; set @save_time_zone= @@time_zone; set time_zone='+03:00'; SET @saved_dbug = @@SESSION.debug_dbug; diff --git a/mysql-test/suite/parts/inc/partition_engine.inc b/mysql-test/suite/parts/inc/partition_engine.inc index b2fab2ff27e..947957d29a9 100644 --- a/mysql-test/suite/parts/inc/partition_engine.inc +++ b/mysql-test/suite/parts/inc/partition_engine.inc @@ -262,7 +262,7 @@ DROP TABLE t1; --echo #------------------------------------------------------------------------ --echo # 6 Session default engine differs from engine used within create table --echo #------------------------------------------------------------------------ -eval SET SESSION storage_engine=$engine_other; +eval SET SESSION default_storage_engine=$engine_other; # Bug#16775 Partitions: strange effects on subpartitioned tables, mixed storage engines # Bug#15966 Partitions: crash if session default engine <> engine used in create table eval CREATE TABLE t1 ( @@ -286,4 +286,4 @@ INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig) SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template; --source suite/parts/inc/partition_check.inc DROP TABLE t1; -eval SET SESSION storage_engine=$engine; +eval SET SESSION default_storage_engine=$engine; diff --git a/mysql-test/suite/parts/r/partition_engine_innodb.result b/mysql-test/suite/parts/r/partition_engine_innodb.result index 38221951ae8..0c10490f263 100644 --- a/mysql-test/suite/parts/r/partition_engine_innodb.result +++ b/mysql-test/suite/parts/r/partition_engine_innodb.result @@ -4303,7 +4303,7 @@ DROP TABLE t1; #------------------------------------------------------------------------ # 6 Session default engine differs from engine used within create table #------------------------------------------------------------------------ -SET SESSION storage_engine='MEMORY'; +SET SESSION default_storage_engine='MEMORY'; CREATE TABLE t1 ( f_int1 INTEGER DEFAULT 0, f_int2 INTEGER DEFAULT 0, @@ -5211,7 +5211,7 @@ TRUNCATE t1; # check layout success: 1 # End usability test (inc/partition_check.inc) DROP TABLE t1; -SET SESSION storage_engine='InnoDB'; +SET SESSION default_storage_engine='InnoDB'; DROP VIEW IF EXISTS v1; DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t0_aux; diff --git a/mysql-test/suite/parts/r/partition_engine_myisam.result b/mysql-test/suite/parts/r/partition_engine_myisam.result index 683729fa2f3..4fb756b7dce 100644 --- a/mysql-test/suite/parts/r/partition_engine_myisam.result +++ b/mysql-test/suite/parts/r/partition_engine_myisam.result @@ -4408,7 +4408,7 @@ DROP TABLE t1; #------------------------------------------------------------------------ # 6 Session default engine differs from engine used within create table #------------------------------------------------------------------------ -SET SESSION storage_engine='MEMORY'; +SET SESSION default_storage_engine='MEMORY'; CREATE TABLE t1 ( f_int1 INTEGER DEFAULT 0, f_int2 INTEGER DEFAULT 0, @@ -5332,7 +5332,7 @@ TRUNCATE t1; # check layout success: 1 # End usability test (inc/partition_check.inc) DROP TABLE t1; -SET SESSION storage_engine='MyISAM'; +SET SESSION default_storage_engine='MyISAM'; DROP VIEW IF EXISTS v1; DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t0_aux; diff --git a/mysql-test/suite/parts/r/partition_value_innodb.result b/mysql-test/suite/parts/r/partition_value_innodb.result index 74843ba7e11..fa8ff21208b 100644 --- a/mysql-test/suite/parts/r/partition_value_innodb.result +++ b/mysql-test/suite/parts/r/partition_value_innodb.result @@ -1,5 +1,5 @@ SET @max_row = 20; -SET @@session.storage_engine = 'InnoDB'; +SET @@session.default_storage_engine = 'InnoDB'; #------------------------------------------------------------------------ # There are several testcases disabled because of the open bugs diff --git a/mysql-test/suite/parts/r/partition_value_myisam.result b/mysql-test/suite/parts/r/partition_value_myisam.result index 0678b78819d..5005a93eeb3 100644 --- a/mysql-test/suite/parts/r/partition_value_myisam.result +++ b/mysql-test/suite/parts/r/partition_value_myisam.result @@ -1,5 +1,5 @@ SET @max_row = 20; -SET @@session.storage_engine = 'MyISAM'; +SET @@session.default_storage_engine = 'MyISAM'; #------------------------------------------------------------------------ # There are several testcases disabled because of the open bugs diff --git a/mysql-test/suite/rpl/include/check_type.inc b/mysql-test/suite/rpl/include/check_type.inc index baba7a21e86..c72754cad4f 100644 --- a/mysql-test/suite/rpl/include/check_type.inc +++ b/mysql-test/suite/rpl/include/check_type.inc @@ -17,7 +17,7 @@ if (!$engine_type) { # Use the default storage engine - let $engine_type=`SELECT @@storage_engine`; + let $engine_type=`SELECT @@default_storage_engine`; } connection master; diff --git a/mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result b/mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result index 9fbb7b0ab19..8b6ee56a3b4 100644 --- a/mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result +++ b/mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result @@ -1,6 +1,6 @@ include/master-slave.inc [connection master] -set session storage_engine=innodb; +set session default_storage_engine=innodb; ######################################################################### # CONFIGURATION ######################################################################### diff --git a/mysql-test/suite/rpl/r/rpl_row_create_table.result b/mysql-test/suite/rpl/r/rpl_row_create_table.result index b8a1e2f8246..7ed8338bbfb 100644 --- a/mysql-test/suite/rpl/r/rpl_row_create_table.result +++ b/mysql-test/suite/rpl/r/rpl_row_create_table.result @@ -222,7 +222,7 @@ DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8,t9; connection slave; STOP SLAVE; include/wait_for_slave_to_stop.inc -SET GLOBAL storage_engine=@storage_engine; +SET GLOBAL default_storage_engine=@@default_storage_engine; START SLAVE; include/wait_for_slave_to_start.inc ================ BUG#22864 ================ diff --git a/mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result b/mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result index c97f8968136..a6fc13c31e7 100644 --- a/mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result +++ b/mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result @@ -1,6 +1,6 @@ include/master-slave.inc [connection master] -set session storage_engine=innodb; +set session default_storage_engine=innodb; ######################################################################### # CONFIGURATION ######################################################################### diff --git a/mysql-test/suite/rpl/r/rpl_spec_variables.result b/mysql-test/suite/rpl/r/rpl_spec_variables.result index 96f63a50ea9..b12b692df34 100644 --- a/mysql-test/suite/rpl/r/rpl_spec_variables.result +++ b/mysql-test/suite/rpl/r/rpl_spec_variables.result @@ -140,12 +140,12 @@ COUNT(*)<2000 AND COUNT(*)>0 DROP TABLE IF EXISTS t1,t2; * storage_engine * -SET @restore_master_storage_engine=@@global.storage_engine; -SET @@global.storage_engine=InnoDB; -SET @@session.storage_engine=InnoDB; -SET @restore_slave_storage_engine=@@global.storage_engine; -SET @@global.storage_engine=Memory; -SET @@session.storage_engine=Memory; +SET @restore_master_storage_engine=@@global.default_storage_engine; +SET @@global.default_storage_engine=InnoDB; +SET @@session.default_storage_engine=InnoDB; +SET @restore_slave_storage_engine=@@global.default_storage_engine; +SET @@global.default_storage_engine=Memory; +SET @@session.default_storage_engine=Memory; CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY, b VARCHAR(10)); CREATE TABLE t2 (a INT NOT NULL PRIMARY KEY, b VARCHAR(10)) ENGINE=InnoDB; CREATE TABLE t3 (a INT NOT NULL PRIMARY KEY, b VARCHAR(10)); @@ -184,8 +184,8 @@ t3 CREATE TABLE `t3` ( `b` varchar(10) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MEMORY DEFAULT CHARSET=latin1 -SET @@global.storage_engine=InnoDB; -SET @@session.storage_engine=InnoDB; +SET @@global.default_storage_engine=InnoDB; +SET @@session.default_storage_engine=InnoDB; DROP TABLE IF EXISTS t1,t2,t3; * sql_mode * @@ -212,11 +212,11 @@ DROP TABLE t1; *** clean up *** SET @@global.character_set_database=@restore_master_character_set_database; SET @@global.collation_server=@restore_master_collation_server; -SET @@global.storage_engine=@restore_master_storage_engine; +SET @@global.default_storage_engine=@restore_master_storage_engine; SET @@global.character_set_database=@restore_slave_character_set_database; SET @@global.collation_server=@restore_slave_collation_server; SET @@global.max_heap_table_size=@restore_slave_max_heap_table_size; -SET @@global.storage_engine=@restore_slave_storage_engine; +SET @@global.default_storage_engine=@restore_slave_storage_engine; call mtr.add_suppression("The table 't[12]' is full"); include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result b/mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result index 9fbb7b0ab19..8b6ee56a3b4 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result +++ b/mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result @@ -1,6 +1,6 @@ include/master-slave.inc [connection master] -set session storage_engine=innodb; +set session default_storage_engine=innodb; ######################################################################### # CONFIGURATION ######################################################################### diff --git a/mysql-test/suite/rpl/r/rpl_table_options.result b/mysql-test/suite/rpl/r/rpl_table_options.result index 87fd8c2b2fb..d12b36838f3 100644 --- a/mysql-test/suite/rpl/r/rpl_table_options.result +++ b/mysql-test/suite/rpl/r/rpl_table_options.result @@ -1,7 +1,7 @@ include/master-slave.inc [connection master] install plugin example soname 'ha_example.so'; -set storage_engine=example; +set default_storage_engine=example; connection slave; connection master; create table t1 (a int not null) ull=12340; @@ -25,7 +25,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 `ull`=12340 connection master; drop table t1; -set storage_engine=default; +set default_storage_engine=default; select 1; 1 1 diff --git a/mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test b/mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test index e3dc6cbaa73..8e40295ecfb 100644 --- a/mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test +++ b/mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test @@ -7,6 +7,6 @@ --source include/master-slave.inc --let $engine=Innodb -set session storage_engine=innodb; +set session default_storage_engine=innodb; --source include/rpl_implicit_commit_binlog.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_create_table.test b/mysql-test/suite/rpl/t/rpl_row_create_table.test index 65f14295c19..499244a37c6 100644 --- a/mysql-test/suite/rpl/t/rpl_row_create_table.test +++ b/mysql-test/suite/rpl/t/rpl_row_create_table.test @@ -17,10 +17,10 @@ connection master; # effect, since the variable is only read on start-up. sync_slave_with_master; --disable_query_log -set @storage_engine = @@global.storage_engine; +set @@default_storage_engine = @@global.default_storage_engine; STOP SLAVE; --source include/wait_for_slave_to_stop.inc -SET GLOBAL storage_engine=memory; +SET GLOBAL default_storage_engine=memory; START SLAVE; --source include/wait_for_slave_to_start.inc --enable_query_log @@ -111,7 +111,7 @@ sync_slave_with_master; # Here we reset the value of the default storage engine STOP SLAVE; --source include/wait_for_slave_to_stop.inc -SET GLOBAL storage_engine=@storage_engine; +SET GLOBAL default_storage_engine=@@default_storage_engine; START SLAVE; --source include/wait_for_slave_to_start.inc --enable_ps_protocol diff --git a/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test b/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test index 68e07ef1f44..ba204b05e22 100644 --- a/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test +++ b/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test @@ -7,6 +7,6 @@ --source include/master-slave.inc --let $engine=Innodb -set session storage_engine=innodb; +set session default_storage_engine=innodb; --source include/rpl_implicit_commit_binlog.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_spec_variables.test b/mysql-test/suite/rpl/t/rpl_spec_variables.test index 2cb580fce83..38564d19ff1 100644 --- a/mysql-test/suite/rpl/t/rpl_spec_variables.test +++ b/mysql-test/suite/rpl/t/rpl_spec_variables.test @@ -220,14 +220,14 @@ DROP TABLE IF EXISTS t1,t2; --echo * storage_engine * --connection master -SET @restore_master_storage_engine=@@global.storage_engine; -SET @@global.storage_engine=InnoDB; -SET @@session.storage_engine=InnoDB; +SET @restore_master_storage_engine=@@global.default_storage_engine; +SET @@global.default_storage_engine=InnoDB; +SET @@session.default_storage_engine=InnoDB; --connection slave -SET @restore_slave_storage_engine=@@global.storage_engine; -SET @@global.storage_engine=Memory; -SET @@session.storage_engine=Memory; +SET @restore_slave_storage_engine=@@global.default_storage_engine; +SET @@global.default_storage_engine=Memory; +SET @@session.default_storage_engine=Memory; --connection master CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY, b VARCHAR(10)); @@ -245,8 +245,8 @@ SHOW CREATE TABLE t1; SHOW CREATE TABLE t2; SHOW CREATE TABLE t3; -SET @@global.storage_engine=InnoDB; -SET @@session.storage_engine=InnoDB; +SET @@global.default_storage_engine=InnoDB; +SET @@session.default_storage_engine=InnoDB; --connection master --disable_warnings @@ -291,12 +291,12 @@ DROP TABLE t1; --connection master SET @@global.character_set_database=@restore_master_character_set_database; SET @@global.collation_server=@restore_master_collation_server; -SET @@global.storage_engine=@restore_master_storage_engine; +SET @@global.default_storage_engine=@restore_master_storage_engine; --sync_slave_with_master SET @@global.character_set_database=@restore_slave_character_set_database; SET @@global.collation_server=@restore_slave_collation_server; SET @@global.max_heap_table_size=@restore_slave_max_heap_table_size; -SET @@global.storage_engine=@restore_slave_storage_engine; +SET @@global.default_storage_engine=@restore_slave_storage_engine; # Put at the end since the test otherwise emptied the table. diff --git a/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test b/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test index a095f7f7905..6b1271825ed 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test +++ b/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test @@ -7,6 +7,6 @@ --source include/master-slave.inc --let $engine=Innodb -set session storage_engine=innodb; +set session default_storage_engine=innodb; --source include/rpl_implicit_commit_binlog.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_table_options.test b/mysql-test/suite/rpl/t/rpl_table_options.test index 3f52444a3c7..9e44b8e0825 100644 --- a/mysql-test/suite/rpl/t/rpl_table_options.test +++ b/mysql-test/suite/rpl/t/rpl_table_options.test @@ -4,7 +4,7 @@ --replace_regex /\.dll/.so/ eval install plugin example soname '$HA_EXAMPLE_SO'; -set storage_engine=example; +set default_storage_engine=example; sync_slave_with_master; connection master; @@ -28,7 +28,7 @@ show create table t1; connection master; drop table t1; -set storage_engine=default; +set default_storage_engine=default; select 1; # Cleanup diff --git a/mysql-test/suite/storage_engine/create_table.result b/mysql-test/suite/storage_engine/create_table.result index 2ca144fe50c..a3580c45219 100644 --- a/mysql-test/suite/storage_engine/create_table.result +++ b/mysql-test/suite/storage_engine/create_table.result @@ -34,7 +34,7 @@ SELECT * FROM t1; 1 2 DROP TABLE t1; -SET storage_engine = <STORAGE_ENGINE>; +SET default_storage_engine = <STORAGE_ENGINE>; CREATE TABLE t1 (a <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>; SHOW CREATE TABLE t1; Table Create Table diff --git a/mysql-test/suite/storage_engine/create_table.test b/mysql-test/suite/storage_engine/create_table.test index 2f8971d8b27..eae259cfae2 100644 --- a/mysql-test/suite/storage_engine/create_table.test +++ b/mysql-test/suite/storage_engine/create_table.test @@ -82,7 +82,7 @@ if (!$mysql_errname) # Use the engine as default --source mask_engine.inc -eval SET storage_engine = $storage_engine; +eval SET default_storage_engine = $storage_engine; --let $tbl_opts = $default_tbl_opts --let $create_definition = a $int_col diff --git a/mysql-test/suite/sys_vars/r/storage_engine_basic.result b/mysql-test/suite/sys_vars/r/storage_engine_basic.result index 9461707dd79..013c36c80a0 100644 --- a/mysql-test/suite/sys_vars/r/storage_engine_basic.result +++ b/mysql-test/suite/sys_vars/r/storage_engine_basic.result @@ -2,46 +2,70 @@ SET @start_global_value = @@global.storage_engine; SET @start_session_value = @@session.storage_engine; '#--------------------FN_DYNVARS_005_01-------------------------#' SET @@global.storage_engine = INNODB; +Warnings: +Warning 1287 '@@storage_engine' is deprecated and will be removed in a future release. Please use '@@default_storage_engine' instead SET @@global.storage_engine = DEFAULT; +Warnings: +Warning 1287 '@@storage_engine' is deprecated and will be removed in a future release. Please use '@@default_storage_engine' instead SELECT @@global.storage_engine; @@global.storage_engine InnoDB SET @@session.storage_engine = INNODB; +Warnings: +Warning 1287 '@@storage_engine' is deprecated and will be removed in a future release. Please use '@@default_storage_engine' instead SET @@session.storage_engine = DEFAULT; +Warnings: +Warning 1287 '@@storage_engine' is deprecated and will be removed in a future release. Please use '@@default_storage_engine' instead SELECT @@session.storage_engine; @@session.storage_engine InnoDB '#--------------------FN_DYNVARS_005_02-------------------------#' SET @@global.storage_engine = MYISAM; +Warnings: +Warning 1287 '@@storage_engine' is deprecated and will be removed in a future release. Please use '@@default_storage_engine' instead SELECT @@global.storage_engine; @@global.storage_engine MyISAM SET @@global.storage_engine = MERGE; +Warnings: +Warning 1287 '@@storage_engine' is deprecated and will be removed in a future release. Please use '@@default_storage_engine' instead SELECT @@global.storage_engine; @@global.storage_engine MRG_MyISAM SET @@global.storage_engine = MEMORY; +Warnings: +Warning 1287 '@@storage_engine' is deprecated and will be removed in a future release. Please use '@@default_storage_engine' instead SELECT @@global.storage_engine; @@global.storage_engine MEMORY SET @@global.storage_engine = INNODB; +Warnings: +Warning 1287 '@@storage_engine' is deprecated and will be removed in a future release. Please use '@@default_storage_engine' instead SELECT @@global.storage_engine; @@global.storage_engine InnoDB '#--------------------FN_DYNVARS_005_03-------------------------#' SET @@session.storage_engine = MYISAM; +Warnings: +Warning 1287 '@@storage_engine' is deprecated and will be removed in a future release. Please use '@@default_storage_engine' instead SELECT @@session.storage_engine; @@session.storage_engine MyISAM SET @@session.storage_engine = MERGE; +Warnings: +Warning 1287 '@@storage_engine' is deprecated and will be removed in a future release. Please use '@@default_storage_engine' instead SELECT @@session.storage_engine; @@session.storage_engine MRG_MyISAM SET @@session.storage_engine = MEMORY; +Warnings: +Warning 1287 '@@storage_engine' is deprecated and will be removed in a future release. Please use '@@default_storage_engine' instead SELECT @@session.storage_engine; @@session.storage_engine MEMORY SET @@session.storage_engine = INNODB; +Warnings: +Warning 1287 '@@storage_engine' is deprecated and will be removed in a future release. Please use '@@default_storage_engine' instead SELECT @@session.storage_engine; @@session.storage_engine InnoDB @@ -83,6 +107,8 @@ SET @@global.storage_engine = FALSE; ERROR 42000: Incorrect argument type to variable 'storage_engine' '#---------------------FN_DYNVARS_001_8----------------------#' SET @@storage_engine = MYISAM; +Warnings: +Warning 1287 '@@storage_engine' is deprecated and will be removed in a future release. Please use '@@default_storage_engine' instead SELECT @@storage_engine = @@local.storage_engine; @@storage_engine = @@local.storage_engine 1 @@ -91,6 +117,8 @@ SELECT @@local.storage_engine = @@session.storage_engine; 1 '#---------------------FN_DYNVARS_001_9----------------------#' SET storage_engine = MEMORY; +Warnings: +Warning 1287 '@@storage_engine' is deprecated and will be removed in a future release. Please use '@@default_storage_engine' instead SELECT @@storage_engine; @@storage_engine MEMORY @@ -101,5 +129,11 @@ ERROR 42S02: Unknown table 'session' in field list SELECT storage_engine = @@session.storage_engine; ERROR 42S22: Unknown column 'storage_engine' in 'field list' SET @@storage_engine = @start_global_value; +Warnings: +Warning 1287 '@@storage_engine' is deprecated and will be removed in a future release. Please use '@@default_storage_engine' instead SET @@global.storage_engine = @start_global_value; +Warnings: +Warning 1287 '@@storage_engine' is deprecated and will be removed in a future release. Please use '@@default_storage_engine' instead SET @@session.storage_engine = @start_session_value; +Warnings: +Warning 1287 '@@storage_engine' is deprecated and will be removed in a future release. Please use '@@default_storage_engine' instead diff --git a/mysql-test/suite/vcol/inc/vcol_ins_upd.inc b/mysql-test/suite/vcol/inc/vcol_ins_upd.inc index 945884b3cd5..8cf0fb9ed6c 100644 --- a/mysql-test/suite/vcol/inc/vcol_ins_upd.inc +++ b/mysql-test/suite/vcol/inc/vcol_ins_upd.inc @@ -225,7 +225,7 @@ select * from t1; delete from t1; drop table t1; -let $innodb_engine = `SELECT @@session.storage_engine='innodb'`; +let $innodb_engine = `SELECT @@session.default_storage_engine='innodb'`; if ($innodb_engine) { --echo # diff --git a/mysql-test/suite/vcol/inc/vcol_select.inc b/mysql-test/suite/vcol/inc/vcol_select.inc index cbd1f2cdd26..56e1fc7ad16 100644 --- a/mysql-test/suite/vcol/inc/vcol_select.inc +++ b/mysql-test/suite/vcol/inc/vcol_select.inc @@ -146,7 +146,7 @@ eval explain $s; #### This bug is presumably in base SQL routines as the same happens #### with this table: #### create table t4 (a int primary key, b int, c int unique); -let $myisam_engine = `SELECT @@session.storage_engine='myisam'`; +let $myisam_engine = `SELECT @@session.default_storage_engine='myisam'`; if (!$myisam_engine) { --echo # SELECT * FROM tbl_name WHERE <non-vcol expr> ORDER BY <non-indexed vcol> @@ -171,7 +171,7 @@ eval explain $s; #### This bug is presumably in base SQL routines as the same happens #### with this table: #### create table t4 (a int primary key, b int, c int unique); -let $innodb_engine = `SELECT @@session.storage_engine='innodb'`; +let $innodb_engine = `SELECT @@session.default_storage_engine='innodb'`; if (!$innodb_engine) { --echo # SELECT * FROM tbl_name WHERE <indexed vcol expr> ORDER BY <non-vcol> diff --git a/mysql-test/suite/vcol/r/rpl_vcol.result b/mysql-test/suite/vcol/r/rpl_vcol.result index b3f764da22c..d95ca8b1f75 100644 --- a/mysql-test/suite/vcol/r/rpl_vcol.result +++ b/mysql-test/suite/vcol/r/rpl_vcol.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'InnoDB'; +SET @@session.default_storage_engine = 'InnoDB'; include/master-slave.inc [connection master] connection master; diff --git a/mysql-test/suite/vcol/r/vcol_archive.result b/mysql-test/suite/vcol/r/vcol_archive.result index ec743088ec2..5c11e8bb9e1 100644 --- a/mysql-test/suite/vcol/r/vcol_archive.result +++ b/mysql-test/suite/vcol/r/vcol_archive.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'archive'; +SET @@session.default_storage_engine = 'archive'; create table t1 (a int, b int as (a+1)); ERROR HY000: ARCHIVE storage engine does not support generated columns create table t1 (a int not null); diff --git a/mysql-test/suite/vcol/r/vcol_blackhole.result b/mysql-test/suite/vcol/r/vcol_blackhole.result index 52d40e9a2b8..0bbe439fcc5 100644 --- a/mysql-test/suite/vcol/r/vcol_blackhole.result +++ b/mysql-test/suite/vcol/r/vcol_blackhole.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'blackhole'; +SET @@session.default_storage_engine = 'blackhole'; create table t1 (a int, b int as (a+1)); ERROR HY000: BLACKHOLE storage engine does not support generated columns create table t1 (a int not null); diff --git a/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result b/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result index 19e8efb06ad..a0f33091297 100644 --- a/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result +++ b/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'MyISAM'; +SET @@session.default_storage_engine = 'MyISAM'; # RAND() create or replace table t1 (b double as (rand())); create or replace table t1 (b double as (rand()) PERSISTENT); diff --git a/mysql-test/suite/vcol/r/vcol_column_def_options_innodb.result b/mysql-test/suite/vcol/r/vcol_column_def_options_innodb.result index f6c58e63e59..c0008f8f179 100644 --- a/mysql-test/suite/vcol/r/vcol_column_def_options_innodb.result +++ b/mysql-test/suite/vcol/r/vcol_column_def_options_innodb.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'InnoDB'; +SET @@session.default_storage_engine = 'InnoDB'; # # Section 1. Wrong column definition options # - NOT NULL diff --git a/mysql-test/suite/vcol/r/vcol_column_def_options_myisam.result b/mysql-test/suite/vcol/r/vcol_column_def_options_myisam.result index 204ce1d880c..0aea337b074 100644 --- a/mysql-test/suite/vcol/r/vcol_column_def_options_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_column_def_options_myisam.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'MyISAM'; +SET @@session.default_storage_engine = 'MyISAM'; # # Section 1. Wrong column definition options # - NOT NULL diff --git a/mysql-test/suite/vcol/r/vcol_csv.result b/mysql-test/suite/vcol/r/vcol_csv.result index 9a0a76576f6..f8a0941c020 100644 --- a/mysql-test/suite/vcol/r/vcol_csv.result +++ b/mysql-test/suite/vcol/r/vcol_csv.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'CSV'; +SET @@session.default_storage_engine = 'CSV'; create table t1 (a int, b int as (a+1)); ERROR HY000: CSV storage engine does not support generated columns create table t1 (a int not null); diff --git a/mysql-test/suite/vcol/r/vcol_handler_aria.result b/mysql-test/suite/vcol/r/vcol_handler_aria.result index df36d0fbbf3..d2e6affc4b4 100644 --- a/mysql-test/suite/vcol/r/vcol_handler_aria.result +++ b/mysql-test/suite/vcol/r/vcol_handler_aria.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'maria'; +SET @@session.default_storage_engine = 'maria'; create table t1 (a int, b int as (-a), c int as (-a) persistent, diff --git a/mysql-test/suite/vcol/r/vcol_handler_innodb.result b/mysql-test/suite/vcol/r/vcol_handler_innodb.result index f7576299e9a..c3358acdbb7 100644 --- a/mysql-test/suite/vcol/r/vcol_handler_innodb.result +++ b/mysql-test/suite/vcol/r/vcol_handler_innodb.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'InnoDB'; +SET @@session.default_storage_engine = 'InnoDB'; create table t1 (a int, b int as (-a), c int as (-a) persistent, diff --git a/mysql-test/suite/vcol/r/vcol_handler_myisam.result b/mysql-test/suite/vcol/r/vcol_handler_myisam.result index ff93756adc5..3596ab1f4ca 100644 --- a/mysql-test/suite/vcol/r/vcol_handler_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_handler_myisam.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'MyISAM'; +SET @@session.default_storage_engine = 'MyISAM'; create table t1 (a int, b int as (-a), c int as (-a) persistent, diff --git a/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result b/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result index 3629307a54d..6807f89fdbe 100644 --- a/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result +++ b/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'InnoDB'; +SET @@session.default_storage_engine = 'InnoDB'; create table t1 (a int, b int as (-a), c int as (-a) persistent); diff --git a/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result b/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result index 8eb59ca32ff..43206dba31b 100644 --- a/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'MyISAM'; +SET @@session.default_storage_engine = 'MyISAM'; create table t1 (a int, b int as (-a), c int as (-a) persistent); diff --git a/mysql-test/suite/vcol/r/vcol_keys_innodb.result b/mysql-test/suite/vcol/r/vcol_keys_innodb.result index 23f9cfa0a0b..759de6fbb23 100644 --- a/mysql-test/suite/vcol/r/vcol_keys_innodb.result +++ b/mysql-test/suite/vcol/r/vcol_keys_innodb.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'InnoDB'; +SET @@session.default_storage_engine = 'InnoDB'; # - UNIQUE KEY # - INDEX # - FULLTEXT INDEX diff --git a/mysql-test/suite/vcol/r/vcol_keys_myisam.result b/mysql-test/suite/vcol/r/vcol_keys_myisam.result index 9400127211c..33375a14803 100644 --- a/mysql-test/suite/vcol/r/vcol_keys_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_keys_myisam.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'MyISAM'; +SET @@session.default_storage_engine = 'MyISAM'; # - UNIQUE KEY # - INDEX # - FULLTEXT INDEX diff --git a/mysql-test/suite/vcol/r/vcol_memory.result b/mysql-test/suite/vcol/r/vcol_memory.result index 1324be82101..3284d97398e 100644 --- a/mysql-test/suite/vcol/r/vcol_memory.result +++ b/mysql-test/suite/vcol/r/vcol_memory.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'memory'; +SET @@session.default_storage_engine = 'memory'; create table t1 (a int, b int as (a+1)); ERROR HY000: MEMORY storage engine does not support generated columns create table t1 (a int not null); diff --git a/mysql-test/suite/vcol/r/vcol_non_stored_columns_innodb.result b/mysql-test/suite/vcol/r/vcol_non_stored_columns_innodb.result index 84817469fa2..058c389e885 100644 --- a/mysql-test/suite/vcol/r/vcol_non_stored_columns_innodb.result +++ b/mysql-test/suite/vcol/r/vcol_non_stored_columns_innodb.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'InnoDB'; +SET @@session.default_storage_engine = 'InnoDB'; # Case 1. All non-stored columns. # This scenario is currently impossible due to the fact that virtual columns # with a constant expression are not allowed. diff --git a/mysql-test/suite/vcol/r/vcol_non_stored_columns_myisam.result b/mysql-test/suite/vcol/r/vcol_non_stored_columns_myisam.result index b4b41635110..bc1ba990596 100644 --- a/mysql-test/suite/vcol/r/vcol_non_stored_columns_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_non_stored_columns_myisam.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'MyISAM'; +SET @@session.default_storage_engine = 'MyISAM'; # Case 1. All non-stored columns. # This scenario is currently impossible due to the fact that virtual columns # with a constant expression are not allowed. diff --git a/mysql-test/suite/vcol/r/vcol_partition_innodb.result b/mysql-test/suite/vcol/r/vcol_partition_innodb.result index 4c869a0a37d..c25fc7b2490 100644 --- a/mysql-test/suite/vcol/r/vcol_partition_innodb.result +++ b/mysql-test/suite/vcol/r/vcol_partition_innodb.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'InnoDB'; +SET @@session.default_storage_engine = 'InnoDB'; drop table if exists t1; # Case 1. Partitioning by RANGE based on a non-stored virtual column. CREATE TABLE t1 ( diff --git a/mysql-test/suite/vcol/r/vcol_partition_myisam.result b/mysql-test/suite/vcol/r/vcol_partition_myisam.result index aeeaec2ac22..a7733ddf2d6 100644 --- a/mysql-test/suite/vcol/r/vcol_partition_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_partition_myisam.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'MyISAM'; +SET @@session.default_storage_engine = 'MyISAM'; drop table if exists t1; # Case 1. Partitioning by RANGE based on a non-stored virtual column. CREATE TABLE t1 ( diff --git a/mysql-test/suite/vcol/r/vcol_select_innodb.result b/mysql-test/suite/vcol/r/vcol_select_innodb.result index 6ebdd87029b..af87b4a5455 100644 --- a/mysql-test/suite/vcol/r/vcol_select_innodb.result +++ b/mysql-test/suite/vcol/r/vcol_select_innodb.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'InnoDB'; +SET @@session.default_storage_engine = 'InnoDB'; create table t1 (a int, b int as (-a), c int as (-a) persistent, diff --git a/mysql-test/suite/vcol/r/vcol_select_myisam.result b/mysql-test/suite/vcol/r/vcol_select_myisam.result index 05c68e5d893..d7a579a3a77 100644 --- a/mysql-test/suite/vcol/r/vcol_select_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_select_myisam.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'MyISAM'; +SET @@session.default_storage_engine = 'MyISAM'; create table t1 (a int, b int as (-a), c int as (-a) persistent, diff --git a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs.result b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs.result index 10ab32f9486..587ac9c150d 100644 --- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs.result +++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'MyISAM'; +SET @@session.default_storage_engine = 'MyISAM'; # # NUMERIC FUNCTIONS # diff --git a/mysql-test/suite/vcol/r/vcol_trigger_sp_innodb.result b/mysql-test/suite/vcol/r/vcol_trigger_sp_innodb.result index 403515482f0..c4f6e0c5125 100644 --- a/mysql-test/suite/vcol/r/vcol_trigger_sp_innodb.result +++ b/mysql-test/suite/vcol/r/vcol_trigger_sp_innodb.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'InnoDB'; +SET @@session.default_storage_engine = 'InnoDB'; create table t1 (a int, b int as (a/10), c int as (a/10) persistent); diff --git a/mysql-test/suite/vcol/r/vcol_trigger_sp_myisam.result b/mysql-test/suite/vcol/r/vcol_trigger_sp_myisam.result index de605bf8722..467e7f8bb4e 100644 --- a/mysql-test/suite/vcol/r/vcol_trigger_sp_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_trigger_sp_myisam.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'MyISAM'; +SET @@session.default_storage_engine = 'MyISAM'; create table t1 (a int, b int as (a/10), c int as (a/10) persistent); diff --git a/mysql-test/suite/vcol/r/vcol_view_innodb.result b/mysql-test/suite/vcol/r/vcol_view_innodb.result index b5d722f4d58..e6895243371 100644 --- a/mysql-test/suite/vcol/r/vcol_view_innodb.result +++ b/mysql-test/suite/vcol/r/vcol_view_innodb.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'InnoDB'; +SET @@session.default_storage_engine = 'InnoDB'; create table t1 (a int not null, b int as (-a), c int as (-a) persistent); diff --git a/mysql-test/suite/vcol/r/vcol_view_myisam.result b/mysql-test/suite/vcol/r/vcol_view_myisam.result index 8f86774c418..9c0dcba2128 100644 --- a/mysql-test/suite/vcol/r/vcol_view_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_view_myisam.result @@ -1,4 +1,4 @@ -SET @@session.storage_engine = 'MyISAM'; +SET @@session.default_storage_engine = 'MyISAM'; create table t1 (a int not null, b int as (-a), c int as (-a) persistent); diff --git a/mysql-test/suite/vcol/t/rpl_vcol.test b/mysql-test/suite/vcol/t/rpl_vcol.test index 03837df1b99..d893ebac855 100644 --- a/mysql-test/suite/vcol/t/rpl_vcol.test +++ b/mysql-test/suite/vcol/t/rpl_vcol.test @@ -28,7 +28,7 @@ ##### Storage engine to be tested # Set the session storage engine --source include/have_innodb.inc -SET @@session.storage_engine = 'InnoDB'; +SET @@session.default_storage_engine = 'InnoDB'; #------------------------------------------------------------------------------# # Cleanup diff --git a/mysql-test/suite/vcol/t/vcol_archive.test b/mysql-test/suite/vcol/t/vcol_archive.test index c0c9ecc445d..b708b3a451a 100644 --- a/mysql-test/suite/vcol/t/vcol_archive.test +++ b/mysql-test/suite/vcol/t/vcol_archive.test @@ -32,7 +32,7 @@ ##### Storage engine to be tested # Set the session storage engine --source include/have_archive.inc -SET @@session.storage_engine = 'archive'; +SET @@session.default_storage_engine = 'archive'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_blackhole.test b/mysql-test/suite/vcol/t/vcol_blackhole.test index eac074d9595..6cbc68a994f 100644 --- a/mysql-test/suite/vcol/t/vcol_blackhole.test +++ b/mysql-test/suite/vcol/t/vcol_blackhole.test @@ -32,7 +32,7 @@ ##### Storage engine to be tested # Set the session storage engine --source include/have_blackhole.inc -SET @@session.storage_engine = 'blackhole'; +SET @@session.default_storage_engine = 'blackhole'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_blocked_sql_funcs.test b/mysql-test/suite/vcol/t/vcol_blocked_sql_funcs.test index 3e9e5936476..d00ab8276e7 100644 --- a/mysql-test/suite/vcol/t/vcol_blocked_sql_funcs.test +++ b/mysql-test/suite/vcol/t/vcol_blocked_sql_funcs.test @@ -32,7 +32,7 @@ ##### Storage engine to be tested # Set the session storage engine -eval SET @@session.storage_engine = 'MyISAM'; +eval SET @@session.default_storage_engine = 'MyISAM'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_column_def_options_innodb.test b/mysql-test/suite/vcol/t/vcol_column_def_options_innodb.test index 38baa2b3024..6fb6a5040b1 100644 --- a/mysql-test/suite/vcol/t/vcol_column_def_options_innodb.test +++ b/mysql-test/suite/vcol/t/vcol_column_def_options_innodb.test @@ -34,7 +34,7 @@ ##### Storage engine to be tested # Set the session storage engine --source include/have_innodb.inc -eval SET @@session.storage_engine = 'InnoDB'; +eval SET @@session.default_storage_engine = 'InnoDB'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_column_def_options_myisam.test b/mysql-test/suite/vcol/t/vcol_column_def_options_myisam.test index 5c3a4619834..63081429ada 100644 --- a/mysql-test/suite/vcol/t/vcol_column_def_options_myisam.test +++ b/mysql-test/suite/vcol/t/vcol_column_def_options_myisam.test @@ -33,7 +33,7 @@ ##### Storage engine to be tested # Set the session storage engine -eval SET @@session.storage_engine = 'MyISAM'; +eval SET @@session.default_storage_engine = 'MyISAM'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_csv.test b/mysql-test/suite/vcol/t/vcol_csv.test index 75ddf819818..0c218df6388 100644 --- a/mysql-test/suite/vcol/t/vcol_csv.test +++ b/mysql-test/suite/vcol/t/vcol_csv.test @@ -32,7 +32,7 @@ ##### Storage engine to be tested # Set the session storage engine --source include/have_csv.inc -SET @@session.storage_engine = 'CSV'; +SET @@session.default_storage_engine = 'CSV'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_handler_aria.test b/mysql-test/suite/vcol/t/vcol_handler_aria.test index 9b69e600767..0787321e295 100644 --- a/mysql-test/suite/vcol/t/vcol_handler_aria.test +++ b/mysql-test/suite/vcol/t/vcol_handler_aria.test @@ -35,7 +35,7 @@ ##### Storage engine to be tested # Set the session storage engine -eval SET @@session.storage_engine = 'maria'; +eval SET @@session.default_storage_engine = 'maria'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_handler_innodb.test b/mysql-test/suite/vcol/t/vcol_handler_innodb.test index bf443c6bbd3..c86cbd0daae 100644 --- a/mysql-test/suite/vcol/t/vcol_handler_innodb.test +++ b/mysql-test/suite/vcol/t/vcol_handler_innodb.test @@ -34,7 +34,7 @@ ##### Storage engine to be tested # Set the session storage engine --source include/have_innodb.inc -eval SET @@session.storage_engine = 'InnoDB'; +eval SET @@session.default_storage_engine = 'InnoDB'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_handler_myisam.test b/mysql-test/suite/vcol/t/vcol_handler_myisam.test index 5aa16da180a..424752d9d23 100644 --- a/mysql-test/suite/vcol/t/vcol_handler_myisam.test +++ b/mysql-test/suite/vcol/t/vcol_handler_myisam.test @@ -33,7 +33,7 @@ ##### Storage engine to be tested # Set the session storage engine -eval SET @@session.storage_engine = 'MyISAM'; +eval SET @@session.default_storage_engine = 'MyISAM'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_ins_upd_innodb.test b/mysql-test/suite/vcol/t/vcol_ins_upd_innodb.test index 5d9ac12e930..fd1af0abd9e 100644 --- a/mysql-test/suite/vcol/t/vcol_ins_upd_innodb.test +++ b/mysql-test/suite/vcol/t/vcol_ins_upd_innodb.test @@ -34,7 +34,7 @@ ##### Storage engine to be tested # Set the session storage engine --source include/have_innodb.inc -eval SET @@session.storage_engine = 'InnoDB'; +eval SET @@session.default_storage_engine = 'InnoDB'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_ins_upd_myisam.test b/mysql-test/suite/vcol/t/vcol_ins_upd_myisam.test index 7840c191194..d73d0aa613c 100644 --- a/mysql-test/suite/vcol/t/vcol_ins_upd_myisam.test +++ b/mysql-test/suite/vcol/t/vcol_ins_upd_myisam.test @@ -33,7 +33,7 @@ ##### Storage engine to be tested # Set the session storage engine -eval SET @@session.storage_engine = 'MyISAM'; +eval SET @@session.default_storage_engine = 'MyISAM'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_keys_innodb.test b/mysql-test/suite/vcol/t/vcol_keys_innodb.test index b6ec73064c5..488a2b936d0 100644 --- a/mysql-test/suite/vcol/t/vcol_keys_innodb.test +++ b/mysql-test/suite/vcol/t/vcol_keys_innodb.test @@ -34,7 +34,7 @@ ##### Storage engine to be tested # Set the session storage engine --source include/have_innodb.inc -SET @@session.storage_engine = 'InnoDB'; +SET @@session.default_storage_engine = 'InnoDB'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_keys_myisam.test b/mysql-test/suite/vcol/t/vcol_keys_myisam.test index 86fb8aecbe2..0856616dcc3 100644 --- a/mysql-test/suite/vcol/t/vcol_keys_myisam.test +++ b/mysql-test/suite/vcol/t/vcol_keys_myisam.test @@ -35,7 +35,7 @@ ##### Storage engine to be tested # Set the session storage engine -SET @@session.storage_engine = 'MyISAM'; +SET @@session.default_storage_engine = 'MyISAM'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_memory.test b/mysql-test/suite/vcol/t/vcol_memory.test index f481427fa93..b78850ede89 100644 --- a/mysql-test/suite/vcol/t/vcol_memory.test +++ b/mysql-test/suite/vcol/t/vcol_memory.test @@ -31,7 +31,7 @@ ##### Storage engine to be tested # Set the session storage engine -SET @@session.storage_engine = 'memory'; +SET @@session.default_storage_engine = 'memory'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_non_stored_columns_innodb.test b/mysql-test/suite/vcol/t/vcol_non_stored_columns_innodb.test index 88ed6157294..8f7a467136d 100644 --- a/mysql-test/suite/vcol/t/vcol_non_stored_columns_innodb.test +++ b/mysql-test/suite/vcol/t/vcol_non_stored_columns_innodb.test @@ -36,7 +36,7 @@ ##### Storage engine to be tested # Set the session storage engine --source include/have_innodb.inc -eval SET @@session.storage_engine = 'InnoDB'; +eval SET @@session.default_storage_engine = 'InnoDB'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_non_stored_columns_myisam.test b/mysql-test/suite/vcol/t/vcol_non_stored_columns_myisam.test index 32481e792ec..74c11ba8b7d 100644 --- a/mysql-test/suite/vcol/t/vcol_non_stored_columns_myisam.test +++ b/mysql-test/suite/vcol/t/vcol_non_stored_columns_myisam.test @@ -35,7 +35,7 @@ ##### Storage engine to be tested # Set the session storage engine -eval SET @@session.storage_engine = 'MyISAM'; +eval SET @@session.default_storage_engine = 'MyISAM'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_partition_innodb.test b/mysql-test/suite/vcol/t/vcol_partition_innodb.test index 7790a82800c..7b8e8de25d4 100644 --- a/mysql-test/suite/vcol/t/vcol_partition_innodb.test +++ b/mysql-test/suite/vcol/t/vcol_partition_innodb.test @@ -34,7 +34,7 @@ ##### Storage engine to be tested # Set the session storage engine --source include/have_innodb.inc -eval SET @@session.storage_engine = 'InnoDB'; +eval SET @@session.default_storage_engine = 'InnoDB'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_partition_myisam.test b/mysql-test/suite/vcol/t/vcol_partition_myisam.test index 25f0d42c300..b41a2482fac 100644 --- a/mysql-test/suite/vcol/t/vcol_partition_myisam.test +++ b/mysql-test/suite/vcol/t/vcol_partition_myisam.test @@ -34,7 +34,7 @@ ##### Storage engine to be tested # Set the session storage engine -eval SET @@session.storage_engine = 'MyISAM'; +eval SET @@session.default_storage_engine = 'MyISAM'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_select_innodb.test b/mysql-test/suite/vcol/t/vcol_select_innodb.test index 8b85d04bfb5..606801a213a 100644 --- a/mysql-test/suite/vcol/t/vcol_select_innodb.test +++ b/mysql-test/suite/vcol/t/vcol_select_innodb.test @@ -35,7 +35,7 @@ ##### Storage engine to be tested # Set the session storage engine --source include/have_innodb.inc -eval SET @@session.storage_engine = 'InnoDB'; +eval SET @@session.default_storage_engine = 'InnoDB'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_select_myisam.test b/mysql-test/suite/vcol/t/vcol_select_myisam.test index d60288d45ed..1e1adf29b3c 100644 --- a/mysql-test/suite/vcol/t/vcol_select_myisam.test +++ b/mysql-test/suite/vcol/t/vcol_select_myisam.test @@ -34,7 +34,7 @@ ##### Storage engine to be tested # Set the session storage engine -eval SET @@session.storage_engine = 'MyISAM'; +eval SET @@session.default_storage_engine = 'MyISAM'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_supported_sql_funcs.test b/mysql-test/suite/vcol/t/vcol_supported_sql_funcs.test index d1e21af059b..36c1ba09692 100644 --- a/mysql-test/suite/vcol/t/vcol_supported_sql_funcs.test +++ b/mysql-test/suite/vcol/t/vcol_supported_sql_funcs.test @@ -32,7 +32,7 @@ ##### Storage engine to be tested # Set the session storage engine -eval SET @@session.storage_engine = 'MyISAM'; +eval SET @@session.default_storage_engine = 'MyISAM'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_trigger_sp_innodb.test b/mysql-test/suite/vcol/t/vcol_trigger_sp_innodb.test index 5a36fb1c06d..c35a1279629 100644 --- a/mysql-test/suite/vcol/t/vcol_trigger_sp_innodb.test +++ b/mysql-test/suite/vcol/t/vcol_trigger_sp_innodb.test @@ -35,7 +35,7 @@ ##### Storage engine to be tested # Set the session storage engine --source include/have_innodb.inc -eval SET @@session.storage_engine = 'InnoDB'; +eval SET @@session.default_storage_engine = 'InnoDB'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_trigger_sp_myisam.test b/mysql-test/suite/vcol/t/vcol_trigger_sp_myisam.test index c475a31eaa6..d5f36d805f1 100644 --- a/mysql-test/suite/vcol/t/vcol_trigger_sp_myisam.test +++ b/mysql-test/suite/vcol/t/vcol_trigger_sp_myisam.test @@ -34,7 +34,7 @@ ##### Storage engine to be tested # Set the session storage engine -eval SET @@session.storage_engine = 'MyISAM'; +eval SET @@session.default_storage_engine = 'MyISAM'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_view_innodb.test b/mysql-test/suite/vcol/t/vcol_view_innodb.test index 01fced8e4c3..fd77489f5dc 100644 --- a/mysql-test/suite/vcol/t/vcol_view_innodb.test +++ b/mysql-test/suite/vcol/t/vcol_view_innodb.test @@ -34,7 +34,7 @@ ##### Storage engine to be tested # Set the session storage engine --source include/have_innodb.inc -eval SET @@session.storage_engine = 'InnoDB'; +eval SET @@session.default_storage_engine = 'InnoDB'; ##### Workarounds for known open engine specific bugs # none diff --git a/mysql-test/suite/vcol/t/vcol_view_myisam.test b/mysql-test/suite/vcol/t/vcol_view_myisam.test index 2ebd36431bc..1b4a387a1ae 100644 --- a/mysql-test/suite/vcol/t/vcol_view_myisam.test +++ b/mysql-test/suite/vcol/t/vcol_view_myisam.test @@ -33,7 +33,7 @@ ##### Storage engine to be tested # Set the session storage engine -eval SET @@session.storage_engine = 'MyISAM'; +eval SET @@session.default_storage_engine = 'MyISAM'; ##### Workarounds for known open engine specific bugs # none diff --git a/plugin/feedback/feedback.cc b/plugin/feedback/feedback.cc index b8e6feb3807..6d6ef468cc6 100644 --- a/plugin/feedback/feedback.cc +++ b/plugin/feedback/feedback.cc @@ -178,7 +178,7 @@ static LEX_STRING vars_filter[]= { {C_STRING_WITH_LEN("secure_auth")}, {C_STRING_WITH_LEN("slow_launch_time")}, {C_STRING_WITH_LEN("sql%")}, - {C_STRING_WITH_LEN("storage_engine")}, + {C_STRING_WITH_LEN("default_storage_engine")}, {C_STRING_WITH_LEN("sync_binlog")}, {C_STRING_WITH_LEN("table_definition_cache")}, {C_STRING_WITH_LEN("table_open_cache")}, diff --git a/scripts/fill_help_tables.sql b/scripts/fill_help_tables.sql index e110c00c277..d0efb750330 100644 --- a/scripts/fill_help_tables.sql +++ b/scripts/fill_help_tables.sql @@ -742,7 +742,7 @@ insert into help_topic (help_topic_id,help_category_id,name,description,example, insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (658,39,'CREATE SEQUENCE','CREATE SEQUENCE was introduced in MariaDB 10.3.\n \nSyntax\n------ \nCREATE [OR REPLACE] [TEMPORARY] SEQUENCE [IF NOT EXISTS]\nsequence_name\n[ INCREMENT [ BY | = ] increment ]\n[ MINVALUE [=] minvalue | NO MINVALUE | NOMINVALUE ]\n[ MAXVALUE [=] maxvalue | NO MAXVALUE | NOMAXVALUE ]\n[ START [ WITH | = ] start ] \n[ CACHE [=] cache | NOCACHE ] [ CYCLE | NOCYCLE] \n[table_options]\n \nThe options for CREATE SEQUENCE can be given in any order,\noptionally followed by table_options.\n \ntable_options can be any of the normal table options in\nCREATE TABLE but the most usable ones are ENGINE=... and\nCOMMENT=.\n \nNOMAXVALUE and NOMINVALUE are there to allow one to create\nSEQUENCEs using the Oracle syntax.\n \nDescription\n----------- \nCREATE SEQUENCE will create a sequence that generates new\nvalues when called with NEXT VALUE FOR sequence_name. It\'s\nan alternative to AUTO INCREMENT when one wants to have more\ncontrol of how the numbers are generated. As the SEQUENCE\ncaches values (up to CACHE) it can in some cases be much\nfaster than AUTO INCREMENT. Another benefit is that one can\naccess the last value generated by all used sequences, which\nsolves one of the limitations with LAST_INSERT_ID().\n \nCREATE SEQUENCE requires the CREATE privilege.\n \nDROP SEQUENCE can be used to drop a sequence, and ALTER\nSEQUENCE to change it.\n \nArguments to Create\n \nThe following options may be used:\n \nOption | Default value |  Description | \n \nINCREMENT |  1 | Increment to use for values. May be\nnegative. Setting an increment of 0 causes the sequence to\nuse the value of the auto_increment_increment system\nvariable at the time of creation, which is always a positive\nnumber. (see MDEV-16035). | \n \nMINVALUE | 1 if INCREMENT > 0 and -9223372036854775807 if\nINCREMENT < 0 | Minimum value for the sequence | \n \nMAXVALUE | 9223372036854775806 if INCREMENT > 0 and -1 if\nINCREMENT < 0 | Max value for sequence | \n \nSTART | MINVALUE if INCREMENT > 0 and MAX_VALUE if\nINCREMENT< 0 | First value that the sequence will generate |\n\n \nCACHE | 1000 |  Number of values that should be cached. 0\nif no CACHE. The underlying table will be updated first time\na new sequence number is generated and each time the cache\nruns out. | \n \nIf CYCLE is used then the sequence should start again from\nMINVALUE after it has run out of values. Default value is\nNOCYCLE.\n \nConstraints on Create Arguments\n \nTo be able to create a legal sequence, the following must\nhold:\nMAXVALUE >= start\nMAXVALUE > MINVALUE\nSTART >= MINVALUE\nMAXVALUE = -9223372036854775807 (LONGLONG_MIN+1)\n \nNote that sequences can\'t generate the maximum/minimum 64\nbit number because of the constraint of\nMINVALUE and MAXVALUE. \n \nExamples\n-------- \nCREATE SEQUENCE s START WITH 100 INCREMENT BY 10;\n \nCREATE SEQUENCE s2 START WITH -100 INCREMENT BY -10;\n \nThe following statement fails, as the increment conflicts\nwith the defaults\n \nCREATE SEQUENCE s3 START WITH -100 INCREMENT BY 10;\n \nERROR 4082 (HY000): Sequence \'test.s3\' values are\nconflicting\n \nThe sequence can be created by specifying workable minimum\nand maximum values:\n \nCREATE SEQUENCE s3 START WITH -100 INCREMENT BY 10\nMINVALUE=-100 MAXVALUE=1000;\n \n\n\nURL: https://mariadb.com/kb/en/library/create-sequence/','','https://mariadb.com/kb/en/library/create-sequence/'); insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (659,39,'CREATE SERVER','Syntax\n------ \nCREATE [OR REPLACE] SERVER [IF NOT EXISTS] server_name\n FOREIGN DATA WRAPPER wrapper_name\n OPTIONS (option [, option] ...)\n \noption:\n { HOST character-literal\n | DATABASE character-literal\n | USER character-literal\n | PASSWORD character-literal\n | SOCKET character-literal\n | OWNER character-literal\n | PORT numeric-literal }\n \nDescription\n----------- \nThis statement creates the definition of a server for use\nwith the Spider,\nFEDERATED or FederatedX storage\nengine. The CREATE SERVER statement creates a new row within\nthe\nservers table within the mysql database. This statement\nrequires the SUPER privilege.\n \nThe server_name should be a unique reference to the server.\nServer definitions\nare global within the scope of the server, it is not\npossible to qualify the\nserver definition to a specific database. server_name has a\nmaximum length of\n64 characters (names longer than 64 characters are silently\ntruncated), and is\ncase insensitive. You may specify the name as a quoted\nstring.\n \nThe wrapper_name should be mysql, and may be quoted with\nsingle quotes.\nOther values for wrapper_name are not currently supported.\n \nFor each option you must specify either a character literal\nor numeric literal.\nCharacter literals are UTF-8, support a maximum length of 64\ncharacters and\ndefault to a blank (empty) string. String literals are\nsilently truncated to 64\ncharacters. Numeric literals must be a number between 0 and\n9999, default value\nis 0.\n \nNote: The OWNER option is currently not applied, and has no\neffect on\nthe ownership or operation of the server connection that is\ncreated.\n \nThe CREATE SERVER statement creates an entry in the\nmysql.servers table that can later be used with the\nCREATE TABLE statement when creating a Spider, FederatedX or\nFEDERATED table. The options that you specify will\nbe used to populate the columns in the mysql.servers table.\nThe table columns\nare Server_name, Host, Db, Username, Password, Port and\nSocket.\n \n DROP SERVER removes a previously created server definition.\n\n \nCREATE SERVER is not written to the binary log, irrespective\nof\nthe binary log format being used.\n \nFor valid identifiers to use as server names, see Identifier\nNames.\n \nOR REPLACE\n \nIf the optional OR REPLACE clause is used, it acts as a\nshortcut for:\n \nDROP SERVER IF EXISTS name;\n \nCREATE SERVER server_name ...;\n \nIF NOT EXISTS\n \nIf the IF NOT EXISTS clause is used, MariaDB will return a\nwarning instead of an error if the server already exists.\nCannot be used together with OR REPLACE.\n \nExamples\n-------- \nCREATE SERVER s\nFOREIGN DATA WRAPPER mysql\nOPTIONS (USER \'Remote\', HOST \'192.168.1.106\', DATABASE\n\'test\');\n \nOR REPLACE and IF NOT EXISTS:\n \nCREATE SERVER s \nFOREIGN DATA WRAPPER mysql \nOPTIONS (USER \'Remote\', HOST \'192.168.1.106\', DATABASE\n\'test\');\nERROR 1476 (HY000): The foreign server, s, you are trying to\ncreate already exists\n \nCREATE OR REPLACE SERVER s \nFOREIGN DATA WRAPPER mysql \nOPTIONS (USER \'Remote\', HOST \'192.168.1.106\', DATABASE\n\'test\');\nQuery OK, 0 rows affected (0.00 sec)\n \nCREATE SERVER IF NOT EXISTS s \nFOREIGN DATA WRAPPER mysql \nOPTIONS (USER \'Remote\', HOST \'192.168.1.106\', DATABASE\n\'test\');\nQuery OK, 0 rows affected, 1 warning (0.00 sec)\n \nSHOW WARNINGS;\n \n+-------+------+----------------------------------------------------------------+\n| Level | Code | Message |\n+-------+------+----------------------------------------------------------------+\n| Note | 1476 | The foreign server, s, you are trying to\ncreate already exists |\n+-------+------+----------------------------------------------------------------+\n \n\n\nURL: https://mariadb.com/kb/en/library/create-server/','','https://mariadb.com/kb/en/library/create-server/'); insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (660,39,'CREATE TABLE','Syntax\n------ \nCREATE [OR REPLACE] [TEMPORARY] TABLE [IF NOT EXISTS]\ntbl_name\n (create_definition,...) [table_options ]...\n[partition_options]\nCREATE [OR REPLACE] [TEMPORARY] TABLE [IF NOT EXISTS]\ntbl_name\n [(create_definition,...)] [table_options ]...\n[partition_options]\n select_statement\nCREATE [OR REPLACE] [TEMPORARY] TABLE [IF NOT EXISTS]\ntbl_name\n { LIKE old_table_name | (LIKE old_table_name) }\n \nselect_statement:\n [IGNORE | REPLACE] [AS] SELECT ... (Some legal select\nstatement)\n \nDescription\n----------- \nUse the CREATE TABLE statement to create a table with the\ngiven name.\n \nIn its most basic form, the CREATE TABLE statement provides\na table name\nfollowed by a list of columns, indexes, and constraints. By\ndefault, the table\nis created in the default database. Specify a database with\ndb_name.tbl_name.\nIf you quote the table name, you must quote the database\nname and table name\nseparately as `db_name`.`tbl_name`. This is particularly\nuseful for CREATE TABLE ... SELECT, because it allows to\ncreate a table into a database, which contains data from\nother databases. See Identifier Qualifiers.\n \nIf a table with the same name exists, error 1050 results.\nUse IF NOT EXISTS\nto suppress this error and issue a note instead. Use SHOW\nWARNINGS\nto see notes.\n \nThe CREATE TABLE statement automatically commits the current\ntransaction,\nexcept when using the TEMPORARY keyword.\n \nFor valid identifiers to use as table names, see Identifier\nNames.\n \nNote: if the default_storage_engine is set to ColumnStore\nthen it needs setting on all UMs. Otherwise when the tables\nusing the default engine are replicated across UMs they will\nuse the wrong engine. You should therefore not use this\noption as a session variable with ColumnStore.\n \nMicrosecond precision can be between 0-6. If no precision is\nspecified it is assumed to be 0, for backward compatibility\nreasons.\n \nPrivileges\n \nExecuting the CREATE TABLE statement requires the CREATE\nprivilege for the table or the database.\n \nCREATE OR REPLACE TABLE ...\n \nThe OR REPLACE clause was added in MariaDB 10.0.8.\n \nIf the OR REPLACE clause is used and if the table already\nexists, then instead of returning an error, the server will\ndrop the existing table and replace it with the newly\ndefined table.\n \nThis syntax was originally added to make replication more\nrobust if it has to rollback and repeat statements such as\nCREATE ... SELECT on slaves.\n \nCREATE OR REPLACE TABLE table_name (a int);\n \nis basically the same as:\n \nDROP TABLE IF EXISTS table_name;\nCREATE TABLE table_name (a int);\n \nwith the following exceptions:\nIf table_name was locked with LOCK TABLES it will continue\nto be locked after the statement.\nTemporary tables are only dropped if the TEMPORARY keyword\nwas used. (With DROP TABLE, temporary tables are preferred\nto be dropped before normal tables).\n \nThings to be Aware of With CREATE OR REPLACE\n \nThe table is dropped first (if it existed), after that the\nCREATE is done. Because of this, if the CREATE fails, then\nthe table will not exist anymore after the statement. If the\ntable was used with LOCK TABLES it will be unlocked.\nOne can\'t use OR REPLACE together with IF EXISTS.\nSlaves in replication will by default use CREATE OR REPLACE\nwhen replicating CREATE statements that don\'\'t use IF\nEXISTS. This can be changed by setting the variable\nslave-ddl-exec-mode to STRICT.\n \nCREATE TABLE IF NOT EXISTS ...\n \nIf the IF NOT EXISTS clause is used, then the index will\nonly be created if an index with the same name does not\nalready exist. If the index already exists, then a warning\nwill be triggered by default.\n \nCREATE TEMPORARY TABLE ...\n \nUse the TEMPORARY keyword to create a temporary table that\nis only available to your current session. Temporary tables\nare dropped when the your session ends. Temporary table\nnames are specific to your session. They will not conflict\nwith other temporary tables from other session even if they\nshare the same name. They will shadow names of non-temporary\ntables or views, if they are identical. A temporary table\ncan have the same name as a non-temporary table which is\nlocated in the same database. In that case, their name will\nreference the temporary table when used in SQL statements.\nYou must have the CREATE TEMPORARY TABLES privilege on the\ndatabase to create temporary tables. If no storage engine is\nspecified, the default_tmp_storage_engine setting will\ndetermine the engine.\n \nCREATE TABLE ... LIKE\n \nUse the LIKE clause instead of a full table definition to\ncreate a table with the same definition as another table,\nincluding columns, indexes, and table options. Foreign key\ndefinitions, as well as any DATA DIRECTORY or INDEX\nDIRECTORY table options specified on the original table,\nwill not be created.\n \nCREATE TABLE ... SELECT\n \nYou can create a table containing data from other tables\nusing the CREATE ... SELECT statement. Columns will be\ncreated in the table for each field returned by the SELECT\nquery.\n \nYou can also define some columns normally and add other\ncolumns from a SELECT. You can also create columns in the\nnormal way and assign them some values using the query, this\nis done to force a certain type or other field\ncharacteristics. The columns that are not named in the query\nwill be placed before the others. For example:\n \nCREATE TABLE test (a INT NOT NULL, b CHAR(10)) ENGINE=MyISAM\n SELECT 5 AS b, c, d FROM another_table;\n \nRemember that the query just returns data. If you want to\nuse the same indexes, or the same columns attributes ([NOT]\nNULL, DEFAULT, AUTO_INCREMENT) in the new table, you need to\nspecify them manually. Types and sizes are not automatically\npreserved if no data returned by the SELECT requires the\nfull size, and VARCHAR could be converted into CHAR. The\nCAST() function can be used to forcee the new table to use\ncertain types.\n \nAliases (AS) are taken into account, and they should always\nbe used when you SELECT an expression (function,\narithmetical operation, etc).\n \nIf an error occurs during the query, the table will not be\ncreated at all.\n \nIf the new table has a primary key or UNIQUE indexes, you\ncan use the IGNORE or REPLACE keywords to handle duplicate\nkey errors during the query. IGNORE means that the newer\nvalues must not be inserted an identical value exists in the\nindex. REPLACE means that older values must be overwritten.\n \nIf the columns in the new table are more than the rows\nreturned by the query, the columns populated by the query\nwill be placed after other columns. Note that if the strict\nSQL_MODE is on, and the columns that are not names in the\nquery do not have a DEFAULT value, an error will raise and\nno rows will be copied.\n \nConcurrent inserts are not used during the execution of a\nCREATE ... SELECT.\n \nIf the table already exists, an error similar to the\nfollowing will be returned:\n \nERROR 1050 (42S01): Table \'t\' already exists\n \nIf the IF NOT EXISTS clause is used and the table exists, a\nnote will be produced instead of an error.\n \nTo insert rows from a query into an existing table, INSERT\n... SELECT can be used.\n \nColumn Definitions\n \ncreate_definition:\n { col_name column_definition | index_definition |\nperiod_definition | CHECK (expr) }\n \ncolumn_definition:\n data_type\n [NOT NULL | NULL] [DEFAULT default_value | (expression)]\n [AUTO_INCREMENT] [ZEROFILL] [UNIQUE [KEY] | [PRIMARY] KEY]\n [INVISIBLE] [{WITH|WITHOUT} SYSTEM VERSIONING]\n [COMMENT \'string\']\n [COLUMN_FORMAT {FIXED|DYNAMIC|DEFAULT}]\n [reference_definition]\n | data_type [GENERATED ALWAYS] AS { { ROW {START|END} } | {\n(expression) [VIRTUAL | PERSISTENT | STORED] } }\n [UNIQUE [KEY]] [COMMENT \'string\']\n \nconstraint_definition:\n CONSTRAINT [constraint_name] CHECK (expression)\nNote: MariaDB accepts the REFERENCES clause in ALTER TABLE\nand CREATE TABLE column definitions, but that syntax does\nnothing. MariaDB simply parses it without returning any\nerror or warning, for compatibility with other DBMS\'s.\nBefore MariaDB 10.2.1 this was also true for CHECK\nconstraints. Only the syntax for indexes described below\ncreates foreign keys.\n \nEach definition either creates a column in the table or\nspecifies and index or\nconstraint on one or more columns. See Indexes below for\ndetails\non creating indexes.\n \nCreate a column by specifying a column name and a data type,\noptionally\nfollowed by column options. See Data Types for a full list\nof data types allowed in MariaDB.\n \nNULL and NOT NULL\n \nUse the NULL or NOT NULL options to specify that values in\nthe column\nmay or may not be NULL, respectively. By default, values may\nbe NULL. See also NULL Values in MariaDB.\n \nDEFAULT Column Option\n \nThe DEFAULT clause was enhanced in MariaDB 10.2.1. Some\nenhancements include\nBLOB and TEXT columns now support DEFAULT.\nThe DEFAULT clause can now be used with an expression or\nfunction.\n \nSpecify a default value using the DEFAULT clause. If you\ndon\'t specify DEFAULT then the following rules apply:\nIf the column is not defined with NOT NULL, AUTO_INCREMENT\nor TIMESTAMP, an explicit DEFAULT NULL will be added.\nNote that in MySQL and in MariaDB before 10.1.6, you may get\nan explicit DEFAULT for primary key parts, if not specified\nwith NOT NULL.\n \nThe default value will be used if you INSERT a row without\nspecifying a value for that column, or if you specify\nDEFAULT for that column.\nBefore MariaDB 10.2.1 you couldn\'t usually provide an\nexpression or function to evaluate at\ninsertion time. You had to provide a constant default value\ninstead. The one\nexception is that you may use CURRENT_TIMESTAMP as\nthe default value for a TIMESTAMP column to use the current\ntimestamp at insertion time.\n \nCURRENT_TIMESTAMP may also be used as\nthe default value for a DATETIME\n \nFrom MariaDB 10.2.1 you can use most functions in DEFAULT.\nExpressions should have parentheses around them. If you use\na non deterministic function in DEFAULT then all inserts to\nthe table will be replicated in row mode. You can even refer\nto earlier columns in the DEFAULT expression:\n \nCREATE TABLE t1 (a int DEFAULT (1+1), b int DEFAULT (a+1));\nCREATE TABLE t2 (a bigint primary key DEFAULT UUID_SHORT());\n \nThe DEFAULT clause cannot contain any stored functions or\nsubqueries, and a column used in the clause must already\nhave been defined earlier in the statement.\n \nSince MariaDB 10.2.1, it is possible to assign BLOB or TEXT\ncolumns a DEFAULT value. In earlier versions, assigning a\ndefault to these columns was not possible.\n \nStarting from 10.3.3 you can also use DEFAULT (NEXT VALUE\nFOR sequence)\n \nAUTO_INCREMENT Column Option\n \nUse AUTO_INCREMENT to create a column whose value can\ncan be set automatically from a simple counter. You can only\nuse AUTO_INCREMENT\non a column with an integer type. The column must be a key,\nand there can only be\none AUTO_INCREMENT column in a table. If you insert a row\nwithout specifying\na value for that column (or if you specify 0, NULL, or\nDEFAULT\nas the value), the actual value will be taken from the\ncounter, with each insertion\nincrementing the counter by one. You can still insert a\nvalue explicitly. If you\ninsert a value that is greater than the current counter\nvalue, the counter is\nset based on the new value. An AUTO_INCREMENT column is\nimplicitly NOT NULL.\nUse LAST_INSERT_ID to get the AUTO_INCREMENT value\nmost recently used by an INSERT statement.\n \nZEROFILL Column Option\n \nIf the ZEROFILL column option is specified for a column\nusing a numeric data type, then the column will be set to\nUNSIGNED and the spaces used by default to pad the field are\nreplaced with zeros. ZEROFILL is ignored in expressions or\nas part of a UNION. ZEROFILL is a non-standard MySQL and\nMariaDB enhancement.\n \nPRIMARY KEY Column Option\n \nUse PRIMARY KEY (or just KEY) to make a column a primary\nkey. A primary key is a special type of a unique key. There\ncan be at most one primary key per table, and it is\nimplicitly NOT NULL.\n \nSpecifying a column as a unique key creates a unique index\non that column. See the Index Definitions section below for\nmore information.\n \nUNIQUE KEY Column Option\n \nUse UNIQUE KEY (or just UNIQUE) to specify that all values\nin the column\nmust be distinct from each other. Unless the column is NOT\nNULL, there may be\nmultiple rows with NULL in the column. \n \nSpecifying a column as a unique key creates a unique index\non that column. See the Index Definitions section below for\nmore information.\n \nCOMMENT Column Option\n \nYou can provide a comment for each column using the COMMENT\nclause. The maximum length is 1024 characters (it was 255\ncharacters before MariaDB 5.5). Use\nthe SHOW FULL COLUMNS statement to see column comments.\n \nGenerated Columns\n \nA generated column is a column in a table that cannot\nexplicitly be set to a specific value in a DML query.\nInstead, its value is automatically generated based on an\nexpression. This expression might generate the value based\non the values of other columns in the table, or it might\ngenerate the value by calling built-in functions or\nuser-defined functions (UDFs).\n \nThere are two types of generated columns:\nPERSISTENT or STORED: This type\'s value is actually stored\nin the table.\nVIRTUAL: This type\'s value is not stored at all. Instead,\nthe value is generated dynamically when the table is\nqueried. This type is the default.\n \nGenerated columns are also sometimes called computed columns\nor virtual columns.\n \nFor a complete description about generated columns and their\nlimitations, see Generated (Virtual and Persistent/Stored)\nColumns.\n \nCOLUMN_FORMAT\n \nCOLUMN_FORMAT is only used by MySQL Cluster, and is silently\nignored in MariaDB.\n \nCOMPRESSED\n \nCertain columns may be compressed. See Storage-Engine\nIndependent Column Compression.\n \nINVISIBLE\n \nColumns may be made invisible, and hidden in certain\ncontexts. See Invisible Columns.\n \nWITH SYSTEM VERSIONING Column Option\n \nColumns may be explicitly marked as included from system\nversioning. See System-versioned tables for details.\n \nWITHOUT SYSTEM VERSIONING Column Option\n \nColumns may be explicitly marked as excluded from system\nversioning. See System-versioned tables for details.\n \nIndex Definitions\n \nindex_definition:\n {INDEX|KEY} [index_name] [index_type] (index_col_name,...)\n[index_option] ...\n | {FULLTEXT|SPATIAL} [INDEX|KEY] [index_name]\n(index_col_name,...) [index_option] ...\n | [CONSTRAINT [symbol]] PRIMARY KEY [index_type]\n(index_col_name,...) [index_option] ...\n | [CONSTRAINT [symbol]] UNIQUE [INDEX|KEY] [index_name]\n[index_type] (index_col_name,...) [index_option] ...\n | [CONSTRAINT [symbol]] FOREIGN KEY [index_name]\n(index_col_name,...) reference_definition\n \nindex_col_name:\n col_name [(length)] [ASC | DESC]\n \nindex_type:\n USING {BTREE | HASH | RTREE}\n \nindex_option:\n KEY_BLOCK_SIZE [=] value\n | index_type\n | WITH PARSER parser_name\n | COMMENT \'string\'\n | CLUSTERING={YES| NO}\n \nreference_definition:\n REFERENCES tbl_name (index_col_name,...)\n [MATCH FULL | MATCH PARTIAL | MATCH SIMPLE]\n [ON DELETE reference_option]\n [ON UPDATE reference_option]\n \nreference_option:\n RESTRICT | CASCADE | SET NULL | NO ACTION\nINDEX and KEY are synonyms. \n \nIndex names are optional, if not specified an automatic name\nwill be assigned. Index name are needed to drop indexes and\nappear in error messages when a constraint is violated.\n \nIndex Categories\n \nPlain Indexes\n \nPlain indexes are regular indexes that are not unique, and\nare not acting as a primary key or a foreign key. They are\nalso not the \"specialized\" FULLTEXT or SPATIAL indexes.\n \nSee Getting Started with Indexes: Plain Indexes for more\ninformation.\n \nPRIMARY KEY\n \nFor PRIMARY KEY indexes, you can specify a name for the\nindex, but it is silently ignored, and the name of the index\nis always PRIMARY.\n \nSee Getting Started with Indexes: Primary Key for more\ninformation.\n \nUNIQUE\n \nThe UNIQUE keyword means that the index will not accept\nduplicated values, except for NULLs. An error will raise if\nyou try to insert duplicate values in a UNIQUE index.\n \nFor UNIQUE indexes, you can specify a name for the\nconstraint, using the CONSTRAINT keyword. That name will be\nused in error messages.\n \nSee Getting Started with Indexes: Unique Index for more\ninformation.\n \nFOREIGN KEY\n \nFor FOREIGN KEY indexes, a reference definition must be\nprovided.\n \nFor FOREIGN KEY indexes, you can specify a name for the\nconstraint, using the CONSTRAINT keyword. That name will be\nused in error messages.\n \nFirst, you have to specify the name of the target (parent)\ntable and a column or a column list which must be indexed\nand whose values must match to the foreign key\'s values.\nThe MATCH clause is accepted to improve the compatibility\nwith other DBMS\'s, but has no meaning in MariaDB. The ON\nDELETE and ON UPDATE clauses specify what must be done when\na DELETE (or a REPLACE) statements attempts to delete a\nreferenced row from the parent table, and when an UPDATE\nstatement attempts to modify the referenced foreign key\ncolumns in a parent table row, respectively. The following\noptions are allowed:\nRESTRICT: The delete/update operation is not performed. The\nstatement terminates with a 1451 error (SQLSTATE \'2300\').\nNO ACTION: Synonym for RESTRICT.\nCASCADE: The delete/update operation is performed in both\ntables.\nSET NULL: The update or delete goes ahead in the parent\ntable, and the corresponding foreign key fields in the child\ntable are set to NULL. (They must not be defined as NOT NULL\nfor this to succeed).\nSET DEFAULT: This option is currently implemented only for\nthe PBXT storage engine, which is disabled by default and no\nlonger maintained. It sets the child table\'s foreign key\nfields to their DEFAULT values when the referenced parent\ntable key entries are updated or deleted.\n \nIf either clause is omitted, the default behavior for the\nomitted clause is RESTRICT.\n \nSee Foreign Keys for more information.\n \nFULLTEXT\n \nUse the FULLTEXT keyword to create full-text indexes.\n \nSee Full-Text Indexes for more information.\n \nSPATIAL\n \nUse the SPATIAL keyword to create geometric indexes.\n \nSee SPATIAL INDEX for more information.\n \nIndex Options\n \nKEY_BLOCK_SIZE Index Option\n \nThe KEY_BLOCK_SIZE index option is similar to the\nKEY_BLOCK_SIZE table option.\n \nWith the InnoDB storage engine, if you specify a non-zero\nvalue for the KEY_BLOCK_SIZE table option for the whole\ntable, then the table will implicitly be created with the\nROW_FORMAT table option set to COMPRESSED. However, this\ndoes not happen if you just set the KEY_BLOCK_SIZE index\noption for one or more indexes in the table. The InnoDB\nstorage engine ignores the KEY_BLOCK_SIZE index option.\nHowever, the SHOW CREATE TABLE statement may still report it\nfor the index.\n \nFor information about the KEY_BLOCK_SIZE index option, see\nthe KEY_BLOCK_SIZE table option below.\n \nIndex Types\n \nEach storage engine supports some or all index types. See\nStorage Engine Index Types for details on permitted index\ntypes for each storage engine.\n \nDifferent index types are optimized for different kind of\noperations:\nBTREE is the default type, a','','https://mariadb.com/kb/en/library/create-table/'); -update help_topic set description = CONCAT(description, 'nd normally is the best choice.\nIt is supported by all storage engines. It can be used to\ncompare a column\'s value with a value using the =, >, >=,\n0) ,b int check (b> 0), constraint abc check (a>b));\n \nIf you use the second format and you don\'t give a name to\nthe constraint, then the constraint will get a auto\ngenerated name. This is done so that you can later delete\nthe constraint with ALTER TABLE DROP constraint_name.\n \nOne can disable all constraint expression checks by setting\nthe variable check_constraint_checks to OFF. This is useful\nfor example when loading a table that violates some\nconstraints that you want to later find and fix in SQL.\n \nSee CONSTRAINT for more information.\n \nTable Options\n \nFor each individual table you create (or alter), you can set\nsome table options. The general syntax for setting options\nis:\n \n = , [ = ...]\n \nThe equal sign is optional.\n \nSome options are supported by the server and can be used for\nall tables, no matter what storage engine they use; other\noptions can be specified for all storage engines, but have a\nmeaning only for some engines. Also, engines can extend\nCREATE TABLE with new options.\n \nIf the IGNORE_BAD_TABLE_OPTIONS SQL_MODE is enabled, wrong\ntable options generate a warning; otherwise, they generate\nan error.\n \ntable_option: \n [STORAGE] ENGINE [=] engine_name\n | AUTO_INCREMENT [=] value\n | AVG_ROW_LENGTH [=] value\n | [DEFAULT] CHARACTER SET [=] charset_name\n | CHECKSUM [=] {0 | 1}\n | [DEFAULT] COLLATE [=] collation_name\n | COMMENT [=] \'string\'\n | CONNECTION [=] \'connect_string\'\n | DATA DIRECTORY [=] \'absolute path to directory\'\n | DELAY_KEY_WRITE [=] {0 | 1}\n | ENCRYPTED [=] {YES | NO}\n | ENCRYPTION_KEY_ID [=] value\n | IETF_QUOTES [=] {YES | NO}\n | INDEX DIRECTORY [=] \'absolute path to directory\'\n | INSERT_METHOD [=] { NO | FIRST | LAST }\n | KEY_BLOCK_SIZE [=] value\n | MAX_ROWS [=] value\n | MIN_ROWS [=] value\n | PACK_KEYS [=] {0 | 1 | DEFAULT}\n | PAGE_CHECKSUM [=] {0 | 1}\n | PAGE_COMPRESSED [=] {0 | 1}\n | PAGE_COMPRESSION_LEVEL [=] {0 .. 9}\n | PASSWORD [=] \'string\'\n | ROW_FORMAT [=]\n{DEFAULT|DYNAMIC|FIXED|COMPRESSED|REDUNDANT|COMPACT|PAGE}\n | SEQUENCE [=] {0|1}\n | STATS_AUTO_RECALC [=] {DEFAULT|0|1}\n | STATS_PERSISTENT [=] {DEFAULT|0|1}\n | STATS_SAMPLE_PAGES [=] {DEFAULT|value}\n | TABLESPACE tablespace_name\n | TRANSACTIONAL [=] {0 | 1}\n | UNION [=] (tbl_name[,tbl_name]...)\n | WITH SYSTEM VERSIONING\n \n[STORAGE] ENGINE\n \n[STORAGE] ENGINE specifies a storage engine for the table.\nIf this option is not used, the default storage engine is\nused instead. That is, the storage_engine session option\nvalue if it is set, or the value specified for the\n--default-storage-engine mysqld startup options, or InnoDB.\nIf the specified storage engine is not installed and active,\nthe default value will be used, unless the\nNO_ENGINE_SUBSTITUTION SQL MODE is set (default since\nMariaDB 10.0). This is only true for CREATE TABLE, not for\nALTER TABLE. For a list of storage engines that are present\nin your server, issue a SHOW ENGINES.\n \nAUTO_INCREMENT\n \nAUTO_INCREMENT specifies the initial value for the\nAUTO_INCREMENT primary key. This works for MyISAM, Aria,\nInnoDB/XtraDB, MEMORY, and ARCHIVE tables. You can change\nthis option with ALTER TABLE, but in that case the new value\nmust be higher than the highest value which is present in\nthe AUTO_INCREMENT column. If the storage engine does not\nsupport this option, you can insert (and then delete) a row\nhaving the wanted value - 1 in the AUTO_INCREMENT column.\n \nAVG_ROW_LENGTH\n \nAVG_ROW_LENGTH is the average rows size. It only applies to\ntables using MyISAM and Aria storage engines that have the\nROW_FORMAT table option set to FIXED format.\n \nMyISAM uses MAX_ROWS and AVG_ROW_LENGTH to decide the\nmaximum size of a table (default: 256TB, or the maximum file\nsize allowed by the system).\n \n[DEFAULT] CHARACTER SET/CHARSET\n \n[DEFAULT] CHARACTER SET (or [DEFAULT] CHARSET) is used to\nset a default character set for the table. This is the\ncharacter set used for all columns where an explicit\ncharacter set is not specified. If this option is omitted or\nDEFAULT is specified, database\'s default character set will\nbe used. See Setting Character Sets and Collations for\ndetails on setting the character sets.\n \nCHECKSUM/TABLE_CHECKSUM\n \nCHECKSUM (or TABLE_CHECKSUM) can be set to 1 to maintain a\nlive checksum for all table\'s rows. This makes write\noperations slower, but CHECKSUM TABLE will be very fast.\nThis option is only supported for MyISAM and Aria tables.\n \n[DEFAULT] COLLATE\n \n[DEFAULT] COLLATE is used to set a default collation for the\ntable. This is the collation used for all columns where an\nexplicit character set is not specified. If this option is\nomitted or DEFAULT is specified, database\'s default option\nwill be used. See Setting Character Sets and Collations for\ndetails on setting the collations\n \nCOMMENT\n \nCOMMENT is a comment for the table. Maximum length is 2048\ncharacters (before mariaDB 5.5 it was 60 characters). Also\nused to define table parameters when creating a Spider\ntable.\n \nCONNECTION\n \nCONNECTION is used to specify a server name or a connection\nstring for a Spider, CONNECT, Federated or FederatedX table.\n \nDATA DIRECTORY/INDEX DIRECTORY\n \nDATA DIRECTORY and INDEX DIRECTORY were only supported for\nMyISAM and Aria, before MariaDB 5.5. Since 5.5, DATA\nDIRECTORY has also been supported by InnoDB if the\ninnodb_file_per_table server system variable is enabled, but\nonly in CREATE TABLE, not in ALTER TABLE. So, carefully\nchoose a path for InnoDB tables at creation time, because it\ncannot be changed without dropping and re-creating the\ntable. These options specify the paths for data files and\nindex files, respectively. If these options are omitted, the\ndatabase\'s directory will be used to store data files and\nindex files. Note that these table options do not work for\npartitioned tables (use the partition options instead), or\nif the server has been invoked with the\n--skip-symbolic-links startup option. To avoid the\noverwriting of old files with the same name that could be\npresent in the directories, you can use the\n--keep_files_on_create option (an error will be issued if\nfiles already exist). These options are ignored if the\nNO_DIR_IN_CREATE SQL_MODE is enabled (useful for replication\nslaves). Also note that symbolic links cannot be used for\nInnoDB tables.\n \nDATA DIRECTORY works by creating symlinks from where the\ntable would normally have been (inside the datadir) to where\nthe option specifies. For security reasons, to avoid\nbypassing the privilege system, the server does not permit\nsymlinks inside the datadir. Therefore, DATA DIRECTORY\ncannot be used to specify a location inside the datadir. An\nattempt to do so will result in an error 1210 (HY000)\nIncorrect arguments to DATA DIRECTORY.\n \nDELAY_KEY_WRITE\n \nDELAY_KEY_WRITE is supported by MyISAM and Aria, and can be\nset to 1 to speed up write operations. In that case, when\ndata are modified, the indexes are not updated until the\ntable is closed. Writing the changes to the index file\naltogether can be much faster. However, note that this\noption is applied only if the delay_key_write server\nvariable is set to \'ON\'. If it is \'OFF\' the delayed\nindex writes are always disabled, and if it is \'ALL\' the\ndelayed index writes are always used, disregarding the value\nof DELAY_KEY_WRITE.\n \nENCRYPTED\n \nThe ENCRYPTED table option was added in MariaDB 10.1.4\n \nThe ENCRYPTED table option can be used to manually set the\nencryption status of an InnoDB table. See InnoDB / XtraDB\nEncryption for more information.\n \nAria does not currently support the ENCRYPTED table option.\nSee MDEV-18049 about that.\n \nSee Data-at-Rest Encryption for more information.\n \nENCRYPTION_KEY_ID\n \nThe ENCRYPTION_KEY_ID table option was added in MariaDB\n10.1.4\n \nThe ENCRYPTION_KEY_ID table option can be used to manually\nset the encryption key of an InnoDB table. See InnoDB /\nXtraDB Encryption for more information.\n \nAria does not currently support the ENCRYPTION_KEY_ID table\noption. See MDEV-18049 about that.\n \nSee Data-at-Rest Encryption for more information.\n \nIETF_QUOTES\n \nThe IETF_QUOTES option was added in MariaDB 10.1.8\n \nFor the CSV storage engine, the IETF_QUOTES option, when set\nto YES, enables IETF-compatible parsing of embedded quote\nand comma characters. Enabling this option for a table\nimproves compatibility with other tools that use CSV, but is\nnot compatible with MySQL CSV tables, or MariaDB CSV tables\ncreated without this option. Disabled by default.\n \nINSERT_METHOD\n \nINSERT_METHOD is only used with MERGE tables. This option\ndetermines in which underlying table the new rows should be\ninserted. If you set it to \'NO\' (which is the default) no\nnew rows can be added to the table (but you will still be\nable to perform INSERTs directly against the underlying\ntables). FIRST means that the rows are inserted into the\nfirst table, and LAST means that thet are inserted into the\nlast table.\n \nKEY_BLOCK_SIZE\n \nKEY_BLOCK_SIZE is used to determine the size of key blocks,\nin bytes or kilobytes. However, this value is just a hint,\nand the storage engine could modify or ignore it. If\nKEY_BLOCK_SIZE is set to 0, the storage engine\'s default\nvalue will be used.\n \nWith the InnoDB storage engine, if you specify a non-zero\nvalue for the KEY_BLOCK_SIZE table option for the whole\ntable, then the table will implicitly be created with the\nROW_FORMAT table option set to COMPRESSED.\n \nMIN_ROWS/MAX_ROWS\n \nMIN_ROWS and MAX_ROWS let the storage engine know how many\nrows you are planning to store as a minimum and as a\nmaximum. These values will not be used as real limits, but\nthey help the storage engine to optimize the table. MIN_ROWS\nis only used by MEMORY storage engine to decide the minimum\nmemory that is always allocated. MAX_ROWS is used to decide\nthe minimum size for indexes.\n \nPACK_KEYS\n \nPACK_KEYS can be used to determine whether the indexes will\nbe compressed. Set it to 1 to compress all keys. With a\nvalue of 0, compression will not be used. With the DEFAULT\nvalue, only long strings will be compressed. Uncompressed\nkeys are faster.\n \nPAGE_CHECKSUM\n \nPAGE_CHECKSUM is only applicable to Aria tables, and\ndetermines whether indexes and data should use page\nchecksums for extra safety. \n \nPAGE_COMPRESSED\n \nPAGE_COMPRESSED is used to enable InnoDB page compression\nfor InnoDB tables.\n \nPAGE_COMPRESSION_LEVEL\n \nPAGE_COMPRESSION_LEVEL is used to set the compression level\nfor InnoDB page compression for InnoDB tables. The table\nmust also have the PAGE_COMPRESSED table option set to 1.\n \nValid values for PAGE_COMPRESSION_LEVEL are 1 (the best\nspeed) through 9 (the best compression), .\n \nPASSWORD\n \nPASSWORD is unused.\n \nRAID_TYPE\n \nRAID_TYPE is an obsolete option, as the raid support has\nbeen disabled since MySQL 5.0.\n \nROW_FORMAT\n \nThe ROW_FORMAT table option specifies the row format for the\ndata file. Possible values are engine-dependent.\n \nSupported MyISAM Row Formats\n \nFor MyISAM, the supported row formats are: \nFIXED\nDYNAMIC\nCOMPRESSED\n \nThe COMPRESSED row format can only be set by the myisampack\ncommand line tool.\n \nSee MyISAM Storage Formats for more information.\n \nSupported Aria Row Formats\n \nFor Aria, the supported row formats are:\nPAGE\nFIXED\nDYNAMIC.\n \nSee Aria Storage Formats for more information.\n \nSupported InnoDB Row Formats\n \nFor InnoDB/XtraDB, the supported row formats are:\nCOMPACT\nREDUNDANT\nCOMPRESSED\nDYNAMIC.\n \nIf the ROW_FORMAT table option is set to FIXED for an InnoDB\ntable, then the server will either return an error or a\nwarning depending on the value of the innodb_strict_mode\nsystem variable. If the innodb_strict_mode system variable\nis set to OFF, then a warning is issued, and MariaDB will\ncreate the table using the default row format for the\nspecific MariaDB server version. If the innodb_strict_mode\nsystem variable is set to ON, then an error will be raised.\n \nSee XtraDB/InnoDB Storage Formats for more information.\n \nOther Storage Engines and ROW_FORMAT\n \nOther storage engines do not support the ROW_FORMAT table\noption.\n \nSEQUENCE\n \nIf the table is a sequence, then it will have the SEQUENCE\nset to 1.\n \nSTATS_AUTO_RECALC\n \nSTATS_AUTO_RECALC is available only in MariaDB 10.0+. It\nindicates whether to automatically recalculate persistent\nstatistics (see STATS_PERSISTENT, below) for an InnoDB\ntable.\nIf set to 1, statistics will be recalculated when more than\n10% of the data has changed. When set to 0, stats will be\nrecalculated only when an ANALYZE TABLE is run. If set to\nDEFAULT, or left out, the value set by the\ninnodb_stats_auto_recalc system variable applies. See InnoDB\nPersistent Statistics.\n \nSTATS_PERSISTENT\n \nSTATS_PERSISTENT is available only in MariaDB 10.0+. It\nindicates whether the InnoDB statistics created by ANALYZE\nTABLE will remain on disk or not. It can be set to 1 (on\ndisk), 0 (not on disk, the pre-MariaDB 10 behavior), or\nDEFAULT (the same as leaving out the option), in which case\nthe value set by the innodb_stats_persistent system variable\nwill apply. Persistent statistics stored on disk allow the\nstatistics to survive server restarts, and provide better\nquery plan stability. See InnoDB Persistent Statistics.\n \nSTATS_SAMPLE_PAGES\n \nSTATS_SAMPLE_PAGES is available only in MariaDB 10.0+. It\nindicates how many pages are used to sample index\nstatistics. If 0 or DEFAULT, the default value, the\ninnodb_stats_sample_pages value is used. See InnoDB\nPersistent Statistics.\n \nTRANSACTIONAL\n \nTRANSACTIONAL is only applicable for Aria tables. In future\nAria tables created with this option will be fully\ntransactional, but currently this provides a form of crash\nprotection. See Aria Storage Engine for more details.\n \nUNION\n \nUNION must be specified when you create a MERGE table. This\noption contains a comma-separated list of MyISAM tables\nwhich are accessed by the new table. The list is enclosed\nbetween parenthesis. Example: UNION = (t1,t2)\n \nWITH SYSTEM VERSIONING\n \nWITH SYSTEM VERSIONING is used for creating System-versioned\ntables.\n \nPartitions\n \npartition_options:\n PARTITION BY\n { [LINEAR] HASH(expr)\n | [LINEAR] KEY(column_list)\n | RANGE(expr)\n | LIST(expr)\n | SYSTEM_TIME [INTERVAL time_quantity time_unit] [LIMIT\nnum] }\n [PARTITIONS num]\n [SUBPARTITION BY\n { [LINEAR] HASH(expr)\n | [LINEAR] KEY(column_list) }\n [SUBPARTITIONS num]\n ]\n [(partition_definition [, partition_definition] ...)]\n \npartition_definition:\n PARTITION partition_name\n [VALUES {LESS THAN {(expr) | MAXVALUE} | IN (value_list)}]\n [[STORAGE] ENGINE [=] engine_name]\n [COMMENT [=] \'comment_text\' ]\n [DATA DIRECTORY [=] \'data_dir\']\n [INDEX DIRECTORY [=] \'index_dir\']\n [MAX_ROWS [=] max_number_of_rows]\n [MIN_ROWS [=] min_number_of_rows]\n [TABLESPACE [=] tablespace_name]\n [NODEGROUP [=] node_group_id]\n [(subpartition_definition [, subpartition_definition] ...)]\n \nsubpartition_definition:\n SUBPARTITION logical_name\n [[STORAGE] ENGINE [=] engine_name]\n [COMMENT [=] \'comment_text\' ]\n [DATA DIRECTORY [=] \'data_dir\']\n [INDEX DIRECTORY [=] \'index_dir\']\n [MAX_ROWS [=] max_number_of_rows]\n [MIN_ROWS [=] min_number_of_rows]\n [TABLESPACE [=] tablespace_name]\n [NODEGROUP [=] node_group_id]\nIf the PARTITION BY clause is used, the table will be\npartitioned. A partition method must be explicitly indicated\nfor partitions and subpartitions. Partition methods are:\n[LINEAR] HASH creates a hash key which will be used to read\nand write rows. The partition function can be any valid SQL\nexpression which returns an INTEGER number. Thus, it is\npossible to use the HASH method on an integer column, or on\nfunctions which accept integer columns as an argument.\nHowever, VALUES LESS THAN and VALUES IN clauses can not be\nused with HASH. An example:\n \nCREATE TABLE t1 (a INT, b CHAR(5), c DATETIME)\n PARTITION BY HASH ( YEAR(c) );\n \n [LINEAR] HASH can be used for subpartitions, too.\n[LINEAR] KEY is similar to HASH, but the index has an even\ndistribution of data. Also, the expression can only be a\ncolumn or a list of columns. VALUES LESS THAN and VALUES IN\nclauses can not be used with KEY.\nRANGE partitions the rows using on a range of values, using\nthe VALUES LESS THAN operator. VALUES IN is not allowed with\nRANGE. The partition function can be any valid SQL\nexpression which returns a single value.\nLIST assignes partitions based on a table\'s column with a\nrestricted set of possible values. It is similar to RANGE,\nbut VALUES IN must be used for at least 1 columns, and\nVALUES LESS THAN is disallowed.\nSYSTEM_TIME partitioning is used for System-versioned tables\nto store historical data separately from current data.\n \nOnly HASH and KEY can be used for subpartitions, and they\ncan be [LINEAR].\n \nIt is possible to define up to 1024 partitions and\nsubpartitions.\n \nThe number of defined partitions can be optionally specified\nas PARTITION count. This can be done to avoid specifying all\npartitions individually. But you can also declare each\nindividual partition and, additionally, specify a PARTITIONS\ncount clause; in the case, the number of PARTITIONs must\nequal count.\n \nAlso see Partitioning Types Overview.\n \nSequences\n \nCREATE TABLE can also be used to create a SEQUENCE. See\nCREATE SEQUENCE and Sequence Overview.\n \nExamples\n-------- \ncreate table if not exists test (\na bigint auto_increment primary key,\nname varchar(128) charset utf8,\nkey name (name(32))\n) engine=InnoDB default charset latin1;\n \nThis example shows a couple of things:\nUsage of IF NOT EXISTS; If the table already existed, it\nwill not be created. There will not be any error for the\nclient, just a warning.\nHow to create a PRIMARY KEY that is automatically generated.\nHow to specify a table-specific character set and another\nfor a column.\nHow to create an index (name) that is only partly indexed\n(to save space).\n \nThe following clauses will work from MariaDB 10.2.1 only.\n \nCREATE TABLE t1(\n a int DEFAULT (1+1),\n b int DEFAULT (a+1),\n expires DATETIME DEFAULT(NOW() + INTERVAL 1 YEAR),\n x BLOB DEFAULT USER()\n);\n \n\n\nURL: https://mariadb.com/kb/en/library/create-table/') WHERE help_topic_id = 660; +update help_topic set description = CONCAT(description, 'nd normally is the best choice.\nIt is supported by all storage engines. It can be used to\ncompare a column\'s value with a value using the =, >, >=,\n0) ,b int check (b> 0), constraint abc check (a>b));\n \nIf you use the second format and you don\'t give a name to\nthe constraint, then the constraint will get a auto\ngenerated name. This is done so that you can later delete\nthe constraint with ALTER TABLE DROP constraint_name.\n \nOne can disable all constraint expression checks by setting\nthe variable check_constraint_checks to OFF. This is useful\nfor example when loading a table that violates some\nconstraints that you want to later find and fix in SQL.\n \nSee CONSTRAINT for more information.\n \nTable Options\n \nFor each individual table you create (or alter), you can set\nsome table options. The general syntax for setting options\nis:\n \n = , [ = ...]\n \nThe equal sign is optional.\n \nSome options are supported by the server and can be used for\nall tables, no matter what storage engine they use; other\noptions can be specified for all storage engines, but have a\nmeaning only for some engines. Also, engines can extend\nCREATE TABLE with new options.\n \nIf the IGNORE_BAD_TABLE_OPTIONS SQL_MODE is enabled, wrong\ntable options generate a warning; otherwise, they generate\nan error.\n \ntable_option: \n [STORAGE] ENGINE [=] engine_name\n | AUTO_INCREMENT [=] value\n | AVG_ROW_LENGTH [=] value\n | [DEFAULT] CHARACTER SET [=] charset_name\n | CHECKSUM [=] {0 | 1}\n | [DEFAULT] COLLATE [=] collation_name\n | COMMENT [=] \'string\'\n | CONNECTION [=] \'connect_string\'\n | DATA DIRECTORY [=] \'absolute path to directory\'\n | DELAY_KEY_WRITE [=] {0 | 1}\n | ENCRYPTED [=] {YES | NO}\n | ENCRYPTION_KEY_ID [=] value\n | IETF_QUOTES [=] {YES | NO}\n | INDEX DIRECTORY [=] \'absolute path to directory\'\n | INSERT_METHOD [=] { NO | FIRST | LAST }\n | KEY_BLOCK_SIZE [=] value\n | MAX_ROWS [=] value\n | MIN_ROWS [=] value\n | PACK_KEYS [=] {0 | 1 | DEFAULT}\n | PAGE_CHECKSUM [=] {0 | 1}\n | PAGE_COMPRESSED [=] {0 | 1}\n | PAGE_COMPRESSION_LEVEL [=] {0 .. 9}\n | PASSWORD [=] \'string\'\n | ROW_FORMAT [=]\n{DEFAULT|DYNAMIC|FIXED|COMPRESSED|REDUNDANT|COMPACT|PAGE}\n | SEQUENCE [=] {0|1}\n | STATS_AUTO_RECALC [=] {DEFAULT|0|1}\n | STATS_PERSISTENT [=] {DEFAULT|0|1}\n | STATS_SAMPLE_PAGES [=] {DEFAULT|value}\n | TABLESPACE tablespace_name\n | TRANSACTIONAL [=] {0 | 1}\n | UNION [=] (tbl_name[,tbl_name]...)\n | WITH SYSTEM VERSIONING\n \n[STORAGE] ENGINE\n \n[STORAGE] ENGINE specifies a storage engine for the table.\nIf this option is not used, the default storage engine is\nused instead. That is, the default_storage_engine session option\nvalue if it is set, or the value specified for the\n--default-storage-engine mysqld startup options, or InnoDB.\nIf the specified storage engine is not installed and active,\nthe default value will be used, unless the\nNO_ENGINE_SUBSTITUTION SQL MODE is set (default since\nMariaDB 10.0). This is only true for CREATE TABLE, not for\nALTER TABLE. For a list of storage engines that are present\nin your server, issue a SHOW ENGINES.\n \nAUTO_INCREMENT\n \nAUTO_INCREMENT specifies the initial value for the\nAUTO_INCREMENT primary key. This works for MyISAM, Aria,\nInnoDB/XtraDB, MEMORY, and ARCHIVE tables. You can change\nthis option with ALTER TABLE, but in that case the new value\nmust be higher than the highest value which is present in\nthe AUTO_INCREMENT column. If the storage engine does not\nsupport this option, you can insert (and then delete) a row\nhaving the wanted value - 1 in the AUTO_INCREMENT column.\n \nAVG_ROW_LENGTH\n \nAVG_ROW_LENGTH is the average rows size. It only applies to\ntables using MyISAM and Aria storage engines that have the\nROW_FORMAT table option set to FIXED format.\n \nMyISAM uses MAX_ROWS and AVG_ROW_LENGTH to decide the\nmaximum size of a table (default: 256TB, or the maximum file\nsize allowed by the system).\n \n[DEFAULT] CHARACTER SET/CHARSET\n \n[DEFAULT] CHARACTER SET (or [DEFAULT] CHARSET) is used to\nset a default character set for the table. This is the\ncharacter set used for all columns where an explicit\ncharacter set is not specified. If this option is omitted or\nDEFAULT is specified, database\'s default character set will\nbe used. See Setting Character Sets and Collations for\ndetails on setting the character sets.\n \nCHECKSUM/TABLE_CHECKSUM\n \nCHECKSUM (or TABLE_CHECKSUM) can be set to 1 to maintain a\nlive checksum for all table\'s rows. This makes write\noperations slower, but CHECKSUM TABLE will be very fast.\nThis option is only supported for MyISAM and Aria tables.\n \n[DEFAULT] COLLATE\n \n[DEFAULT] COLLATE is used to set a default collation for the\ntable. This is the collation used for all columns where an\nexplicit character set is not specified. If this option is\nomitted or DEFAULT is specified, database\'s default option\nwill be used. See Setting Character Sets and Collations for\ndetails on setting the collations\n \nCOMMENT\n \nCOMMENT is a comment for the table. Maximum length is 2048\ncharacters (before mariaDB 5.5 it was 60 characters). Also\nused to define table parameters when creating a Spider\ntable.\n \nCONNECTION\n \nCONNECTION is used to specify a server name or a connection\nstring for a Spider, CONNECT, Federated or FederatedX table.\n \nDATA DIRECTORY/INDEX DIRECTORY\n \nDATA DIRECTORY and INDEX DIRECTORY were only supported for\nMyISAM and Aria, before MariaDB 5.5. Since 5.5, DATA\nDIRECTORY has also been supported by InnoDB if the\ninnodb_file_per_table server system variable is enabled, but\nonly in CREATE TABLE, not in ALTER TABLE. So, carefully\nchoose a path for InnoDB tables at creation time, because it\ncannot be changed without dropping and re-creating the\ntable. These options specify the paths for data files and\nindex files, respectively. If these options are omitted, the\ndatabase\'s directory will be used to store data files and\nindex files. Note that these table options do not work for\npartitioned tables (use the partition options instead), or\nif the server has been invoked with the\n--skip-symbolic-links startup option. To avoid the\noverwriting of old files with the same name that could be\npresent in the directories, you can use the\n--keep_files_on_create option (an error will be issued if\nfiles already exist). These options are ignored if the\nNO_DIR_IN_CREATE SQL_MODE is enabled (useful for replication\nslaves). Also note that symbolic links cannot be used for\nInnoDB tables.\n \nDATA DIRECTORY works by creating symlinks from where the\ntable would normally have been (inside the datadir) to where\nthe option specifies. For security reasons, to avoid\nbypassing the privilege system, the server does not permit\nsymlinks inside the datadir. Therefore, DATA DIRECTORY\ncannot be used to specify a location inside the datadir. An\nattempt to do so will result in an error 1210 (HY000)\nIncorrect arguments to DATA DIRECTORY.\n \nDELAY_KEY_WRITE\n \nDELAY_KEY_WRITE is supported by MyISAM and Aria, and can be\nset to 1 to speed up write operations. In that case, when\ndata are modified, the indexes are not updated until the\ntable is closed. Writing the changes to the index file\naltogether can be much faster. However, note that this\noption is applied only if the delay_key_write server\nvariable is set to \'ON\'. If it is \'OFF\' the delayed\nindex writes are always disabled, and if it is \'ALL\' the\ndelayed index writes are always used, disregarding the value\nof DELAY_KEY_WRITE.\n \nENCRYPTED\n \nThe ENCRYPTED table option was added in MariaDB 10.1.4\n \nThe ENCRYPTED table option can be used to manually set the\nencryption status of an InnoDB table. See InnoDB / XtraDB\nEncryption for more information.\n \nAria does not currently support the ENCRYPTED table option.\nSee MDEV-18049 about that.\n \nSee Data-at-Rest Encryption for more information.\n \nENCRYPTION_KEY_ID\n \nThe ENCRYPTION_KEY_ID table option was added in MariaDB\n10.1.4\n \nThe ENCRYPTION_KEY_ID table option can be used to manually\nset the encryption key of an InnoDB table. See InnoDB /\nXtraDB Encryption for more information.\n \nAria does not currently support the ENCRYPTION_KEY_ID table\noption. See MDEV-18049 about that.\n \nSee Data-at-Rest Encryption for more information.\n \nIETF_QUOTES\n \nThe IETF_QUOTES option was added in MariaDB 10.1.8\n \nFor the CSV storage engine, the IETF_QUOTES option, when set\nto YES, enables IETF-compatible parsing of embedded quote\nand comma characters. Enabling this option for a table\nimproves compatibility with other tools that use CSV, but is\nnot compatible with MySQL CSV tables, or MariaDB CSV tables\ncreated without this option. Disabled by default.\n \nINSERT_METHOD\n \nINSERT_METHOD is only used with MERGE tables. This option\ndetermines in which underlying table the new rows should be\ninserted. If you set it to \'NO\' (which is the default) no\nnew rows can be added to the table (but you will still be\nable to perform INSERTs directly against the underlying\ntables). FIRST means that the rows are inserted into the\nfirst table, and LAST means that thet are inserted into the\nlast table.\n \nKEY_BLOCK_SIZE\n \nKEY_BLOCK_SIZE is used to determine the size of key blocks,\nin bytes or kilobytes. However, this value is just a hint,\nand the storage engine could modify or ignore it. If\nKEY_BLOCK_SIZE is set to 0, the storage engine\'s default\nvalue will be used.\n \nWith the InnoDB storage engine, if you specify a non-zero\nvalue for the KEY_BLOCK_SIZE table option for the whole\ntable, then the table will implicitly be created with the\nROW_FORMAT table option set to COMPRESSED.\n \nMIN_ROWS/MAX_ROWS\n \nMIN_ROWS and MAX_ROWS let the storage engine know how many\nrows you are planning to store as a minimum and as a\nmaximum. These values will not be used as real limits, but\nthey help the storage engine to optimize the table. MIN_ROWS\nis only used by MEMORY storage engine to decide the minimum\nmemory that is always allocated. MAX_ROWS is used to decide\nthe minimum size for indexes.\n \nPACK_KEYS\n \nPACK_KEYS can be used to determine whether the indexes will\nbe compressed. Set it to 1 to compress all keys. With a\nvalue of 0, compression will not be used. With the DEFAULT\nvalue, only long strings will be compressed. Uncompressed\nkeys are faster.\n \nPAGE_CHECKSUM\n \nPAGE_CHECKSUM is only applicable to Aria tables, and\ndetermines whether indexes and data should use page\nchecksums for extra safety. \n \nPAGE_COMPRESSED\n \nPAGE_COMPRESSED is used to enable InnoDB page compression\nfor InnoDB tables.\n \nPAGE_COMPRESSION_LEVEL\n \nPAGE_COMPRESSION_LEVEL is used to set the compression level\nfor InnoDB page compression for InnoDB tables. The table\nmust also have the PAGE_COMPRESSED table option set to 1.\n \nValid values for PAGE_COMPRESSION_LEVEL are 1 (the best\nspeed) through 9 (the best compression), .\n \nPASSWORD\n \nPASSWORD is unused.\n \nRAID_TYPE\n \nRAID_TYPE is an obsolete option, as the raid support has\nbeen disabled since MySQL 5.0.\n \nROW_FORMAT\n \nThe ROW_FORMAT table option specifies the row format for the\ndata file. Possible values are engine-dependent.\n \nSupported MyISAM Row Formats\n \nFor MyISAM, the supported row formats are: \nFIXED\nDYNAMIC\nCOMPRESSED\n \nThe COMPRESSED row format can only be set by the myisampack\ncommand line tool.\n \nSee MyISAM Storage Formats for more information.\n \nSupported Aria Row Formats\n \nFor Aria, the supported row formats are:\nPAGE\nFIXED\nDYNAMIC.\n \nSee Aria Storage Formats for more information.\n \nSupported InnoDB Row Formats\n \nFor InnoDB/XtraDB, the supported row formats are:\nCOMPACT\nREDUNDANT\nCOMPRESSED\nDYNAMIC.\n \nIf the ROW_FORMAT table option is set to FIXED for an InnoDB\ntable, then the server will either return an error or a\nwarning depending on the value of the innodb_strict_mode\nsystem variable. If the innodb_strict_mode system variable\nis set to OFF, then a warning is issued, and MariaDB will\ncreate the table using the default row format for the\nspecific MariaDB server version. If the innodb_strict_mode\nsystem variable is set to ON, then an error will be raised.\n \nSee XtraDB/InnoDB Storage Formats for more information.\n \nOther Storage Engines and ROW_FORMAT\n \nOther storage engines do not support the ROW_FORMAT table\noption.\n \nSEQUENCE\n \nIf the table is a sequence, then it will have the SEQUENCE\nset to 1.\n \nSTATS_AUTO_RECALC\n \nSTATS_AUTO_RECALC is available only in MariaDB 10.0+. It\nindicates whether to automatically recalculate persistent\nstatistics (see STATS_PERSISTENT, below) for an InnoDB\ntable.\nIf set to 1, statistics will be recalculated when more than\n10% of the data has changed. When set to 0, stats will be\nrecalculated only when an ANALYZE TABLE is run. If set to\nDEFAULT, or left out, the value set by the\ninnodb_stats_auto_recalc system variable applies. See InnoDB\nPersistent Statistics.\n \nSTATS_PERSISTENT\n \nSTATS_PERSISTENT is available only in MariaDB 10.0+. It\nindicates whether the InnoDB statistics created by ANALYZE\nTABLE will remain on disk or not. It can be set to 1 (on\ndisk), 0 (not on disk, the pre-MariaDB 10 behavior), or\nDEFAULT (the same as leaving out the option), in which case\nthe value set by the innodb_stats_persistent system variable\nwill apply. Persistent statistics stored on disk allow the\nstatistics to survive server restarts, and provide better\nquery plan stability. See InnoDB Persistent Statistics.\n \nSTATS_SAMPLE_PAGES\n \nSTATS_SAMPLE_PAGES is available only in MariaDB 10.0+. It\nindicates how many pages are used to sample index\nstatistics. If 0 or DEFAULT, the default value, the\ninnodb_stats_sample_pages value is used. See InnoDB\nPersistent Statistics.\n \nTRANSACTIONAL\n \nTRANSACTIONAL is only applicable for Aria tables. In future\nAria tables created with this option will be fully\ntransactional, but currently this provides a form of crash\nprotection. See Aria Storage Engine for more details.\n \nUNION\n \nUNION must be specified when you create a MERGE table. This\noption contains a comma-separated list of MyISAM tables\nwhich are accessed by the new table. The list is enclosed\nbetween parenthesis. Example: UNION = (t1,t2)\n \nWITH SYSTEM VERSIONING\n \nWITH SYSTEM VERSIONING is used for creating System-versioned\ntables.\n \nPartitions\n \npartition_options:\n PARTITION BY\n { [LINEAR] HASH(expr)\n | [LINEAR] KEY(column_list)\n | RANGE(expr)\n | LIST(expr)\n | SYSTEM_TIME [INTERVAL time_quantity time_unit] [LIMIT\nnum] }\n [PARTITIONS num]\n [SUBPARTITION BY\n { [LINEAR] HASH(expr)\n | [LINEAR] KEY(column_list) }\n [SUBPARTITIONS num]\n ]\n [(partition_definition [, partition_definition] ...)]\n \npartition_definition:\n PARTITION partition_name\n [VALUES {LESS THAN {(expr) | MAXVALUE} | IN (value_list)}]\n [[STORAGE] ENGINE [=] engine_name]\n [COMMENT [=] \'comment_text\' ]\n [DATA DIRECTORY [=] \'data_dir\']\n [INDEX DIRECTORY [=] \'index_dir\']\n [MAX_ROWS [=] max_number_of_rows]\n [MIN_ROWS [=] min_number_of_rows]\n [TABLESPACE [=] tablespace_name]\n [NODEGROUP [=] node_group_id]\n [(subpartition_definition [, subpartition_definition] ...)]\n \nsubpartition_definition:\n SUBPARTITION logical_name\n [[STORAGE] ENGINE [=] engine_name]\n [COMMENT [=] \'comment_text\' ]\n [DATA DIRECTORY [=] \'data_dir\']\n [INDEX DIRECTORY [=] \'index_dir\']\n [MAX_ROWS [=] max_number_of_rows]\n [MIN_ROWS [=] min_number_of_rows]\n [TABLESPACE [=] tablespace_name]\n [NODEGROUP [=] node_group_id]\nIf the PARTITION BY clause is used, the table will be\npartitioned. A partition method must be explicitly indicated\nfor partitions and subpartitions. Partition methods are:\n[LINEAR] HASH creates a hash key which will be used to read\nand write rows. The partition function can be any valid SQL\nexpression which returns an INTEGER number. Thus, it is\npossible to use the HASH method on an integer column, or on\nfunctions which accept integer columns as an argument.\nHowever, VALUES LESS THAN and VALUES IN clauses can not be\nused with HASH. An example:\n \nCREATE TABLE t1 (a INT, b CHAR(5), c DATETIME)\n PARTITION BY HASH ( YEAR(c) );\n \n [LINEAR] HASH can be used for subpartitions, too.\n[LINEAR] KEY is similar to HASH, but the index has an even\ndistribution of data. Also, the expression can only be a\ncolumn or a list of columns. VALUES LESS THAN and VALUES IN\nclauses can not be used with KEY.\nRANGE partitions the rows using on a range of values, using\nthe VALUES LESS THAN operator. VALUES IN is not allowed with\nRANGE. The partition function can be any valid SQL\nexpression which returns a single value.\nLIST assignes partitions based on a table\'s column with a\nrestricted set of possible values. It is similar to RANGE,\nbut VALUES IN must be used for at least 1 columns, and\nVALUES LESS THAN is disallowed.\nSYSTEM_TIME partitioning is used for System-versioned tables\nto store historical data separately from current data.\n \nOnly HASH and KEY can be used for subpartitions, and they\ncan be [LINEAR].\n \nIt is possible to define up to 1024 partitions and\nsubpartitions.\n \nThe number of defined partitions can be optionally specified\nas PARTITION count. This can be done to avoid specifying all\npartitions individually. But you can also declare each\nindividual partition and, additionally, specify a PARTITIONS\ncount clause; in the case, the number of PARTITIONs must\nequal count.\n \nAlso see Partitioning Types Overview.\n \nSequences\n \nCREATE TABLE can also be used to create a SEQUENCE. See\nCREATE SEQUENCE and Sequence Overview.\n \nExamples\n-------- \ncreate table if not exists test (\na bigint auto_increment primary key,\nname varchar(128) charset utf8,\nkey name (name(32))\n) engine=InnoDB default charset latin1;\n \nThis example shows a couple of things:\nUsage of IF NOT EXISTS; If the table already existed, it\nwill not be created. There will not be any error for the\nclient, just a warning.\nHow to create a PRIMARY KEY that is automatically generated.\nHow to specify a table-specific character set and another\nfor a column.\nHow to create an index (name) that is only partly indexed\n(to save space).\n \nThe following clauses will work from MariaDB 10.2.1 only.\n \nCREATE TABLE t1(\n a int DEFAULT (1+1),\n b int DEFAULT (a+1),\n expires DATETIME DEFAULT(NOW() + INTERVAL 1 YEAR),\n x BLOB DEFAULT USER()\n);\n \n\n\nURL: https://mariadb.com/kb/en/library/create-table/') WHERE help_topic_id = 660; insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (661,39,'CREATE TABLESPACE','The CREATE TABLESPACE statement is not supported by MariaDB.\nIt was originally inherited from MySQL NDB Cluster. In MySQL\n5.7 and later, the statement is also supported for InnoDB.\nHowever, MariaDB has chosen not to include that specific\nfeature. See MDEV-19294 for more information.\n \n\n \n \n \n \n \n \n \n\nURL: https://mariadb.com/kb/en/library/create-tablespace/','','https://mariadb.com/kb/en/library/create-tablespace/'); insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (662,39,'CREATE TRIGGER','Syntax\n------ \nCREATE [OR REPLACE]\n [DEFINER = { user | CURRENT_USER | role | CURRENT_ROLE }]\n TRIGGER [IF NOT EXISTS] trigger_name trigger_time\ntrigger_event\n ON tbl_name FOR EACH ROW\n [{ FOLLOWS | PRECEDES } other_trigger_name ]\n trigger_stmt\n \nDescription\n----------- \nThis statement creates a new trigger. A trigger is a named\ndatabase\nobject that is associated with a table, and that activates\nwhen a\nparticular event occurs for the table. The trigger becomes\nassociated\nwith the table named tbl_name, which must refer to a\npermanent table.\nYou cannot associate a trigger with a TEMPORARY table or a\nview.\n \nCREATE TRIGGER requires the TRIGGER privilege for the table\nassociated\nwith the trigger. (Before MySQL 5.1.6, this statement\nrequires the\nSUPER privilege.)\n \nYou can have multiple triggers for the same trigger_time and\ntrigger_event.\n \nFor valid identifiers to use as trigger names, see\nIdentifier Names.\n \nOR REPLACE\n \nIf used and the trigger already exists, instead of an error\nbeing returned, the existing trigger will be dropped and\nreplaced by the newly defined trigger.\n \nDEFINER\n \nThe DEFINER clause determines the security context to be\nused when\nchecking access privileges at trigger activation time.\n \nIF NOT EXISTS\n \nIf the IF NOT EXISTS clause is used, the trigger will only\nbe created if a trigger of the same name does not exist. If\nthe trigger already exists, by default a warning will be\nreturned.\n \ntrigger_time\n \ntrigger_time is the trigger action time. It can be BEFORE or\nAFTER to\nindicate that the trigger activates before or after each row\nto be\nmodified.\n \ntrigger_event\n \ntrigger_event indicates the kind of statement that activates\nthe\ntrigger. The trigger_event can be one of the following:\nINSERT: The trigger is activated whenever a new row is\ninserted into the table; for example, through INSERT, LOAD\nDATA, and REPLACE statements.\nUPDATE: The trigger is activated whenever a row is modified;\nfor example, through UPDATE statements.\nDELETE: The trigger is activated whenever a row is deleted\nfrom the table; for example, through DELETE and REPLACE\nstatements. However, DROP TABLE and TRUNCATE statements on\nthe table do not activate this trigger, because they do not\nuse DELETE. Dropping a partition does not activate DELETE\ntriggers, either.\n \nFOLLOWS/PRECEDES other_trigger_name\n \nThe FOLLOWS other_trigger_name and PRECEDES\nother_trigger_name options were added in MariaDB 10.2.3 as\npart of supporting multiple triggers per action time.\nThis is the same syntax used by MySQL 5.7, although MySQL\n5.7 does not have multi-trigger support.\n \nFOLLOWS adds the new trigger after another trigger while\nPRECEDES adds the new trigger before another trigger. If\nneither option is used, the new trigger is added last for\nthe given action and time.\n \nFOLLOWS and PRECEDES are not stored in the trigger\ndefinition. However the trigger order is guaranteed to not\nchange over time. mysqldump and other backup methods will\nnot change trigger order.\nYou can verify the trigger order from the ACTION_ORDER\ncolumn in INFORMATION_SCHEMA.TRIGGERS table.\n \nSELECT trigger_name, action_order FROM\ninformation_schema.triggers \n WHERE event_object_table=\'t1\';\n \nExamples\n-------- \nCREATE DEFINER=`root`@`localhost` TRIGGER increment_animal\n AFTER INSERT ON animals FOR EACH ROW \n UPDATE animal_count SET animal_count.animals =\nanimal_count.animals+1;\n \nOR REPLACE and IF NOT EXISTS\n \nCREATE DEFINER=`root`@`localhost` TRIGGER increment_animal\n AFTER INSERT ON animals FOR EACH ROW\n UPDATE animal_count SET animal_count.animals =\nanimal_count.animals+1;\n \nERROR 1359 (HY000): Trigger already exists\n \nCREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER\nincrement_animal\n AFTER INSERT ON animals FOR EACH ROW\n UPDATE animal_count SET animal_count.animals =\nanimal_count.animals+1;\n \nQuery OK, 0 rows affected (0.12 sec)\n \nCREATE DEFINER=`root`@`localhost` TRIGGER IF NOT EXISTS\nincrement_animal\n AFTER INSERT ON animals FOR EACH ROW\n UPDATE animal_count SET animal_count.animals =\nanimal_count.animals+1;\n \nQuery OK, 0 rows affected, 1 warning (0.00 sec)\n \nSHOW WARNINGS;\n \n+-------+------+------------------------+\n| Level | Code | Message |\n+-------+------+------------------------+\n| Note | 1359 | Trigger already exists |\n+-------+------+------------------------+\n1 row in set (0.00 sec)\n \n\n\nURL: https://mariadb.com/kb/en/library/create-trigger/','','https://mariadb.com/kb/en/library/create-trigger/'); insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (663,39,'CREATE VIEW','Syntax\n------ \nCREATE\n [OR REPLACE]\n [ALGORITHM = {UNDEFINED | MERGE | TEMPTABLE}]\n [DEFINER = { user | CURRENT_USER | role | CURRENT_ROLE }]\n [SQL SECURITY { DEFINER | INVOKER }]\n VIEW [IF NOT EXISTS] view_name [(column_list)]\n AS select_statement\n [WITH [CASCADED | LOCAL] CHECK OPTION]\n \nDescription\n----------- \nThe CREATE VIEW statement creates a new view, or replaces an\nexisting\none if the OR REPLACE clause is given. If the view does not\nexist, CREATE OR\nREPLACE VIEW is the same as CREATE VIEW. If the view does\nexist, CREATE OR\nREPLACE VIEW is the same as ALTER VIEW.\n \nThe select_statement is a SELECT statement that provides the\ndefinition of\nthe view. (When you select from the view, you select in\neffect using the SELECT\nstatement.) select_statement can select from base tables or\nother views.\n \nThe view definition is \"frozen\" at creation time, so\nchanges to the underlying\ntables afterwards do not affect the view definition. For\nexample, if a view is\ndefined as SELECT * on a table, new columns added to the\ntable later do not\nbecome part of the view. A SHOW CREATE VIEW shows that\nsuch queries are rewritten and column names are included in\nthe view\ndefinition.\n \nThe view definition must be a query that does not return\nerrors at view\ncreation times. However, the base tables used by the views\nmight be altered\nlater and the query may not be valid anymore. In this case,\nquerying the view\nwill result in an error. CHECK TABLE helps in finding this\nkind\nof problems.\n \nThe ALGORITHM clause affects how MariaDB processes the\nview. The DEFINER and SQL SECURITY clauses specify the\nsecurity context to be\nused when checking access privileges at view invocation\ntime. The WITH CHECK\nOPTION clause can be given to constrain inserts or updates\nto rows in tables\nreferenced by the view. These clauses are described later in\nthis section.\n \nThe CREATE VIEW statement requires the CREATE VIEW privilege\nfor the\nview, and some privilege for each column selected by the\nSELECT\nstatement. For columns used elsewhere in the SELECT\nstatement you must\nhave the SELECT privilege. If the OR REPLACE clause is\npresent, you\nmust also have the DROP privilege for the view.\n \nA view belongs to a database. By default, a new view is\ncreated in the\ndefault database. To create the view explicitly in a given\ndatabase,\nspecify the name as db_name.view_name when you create it.\n \nCREATE VIEW test.v AS SELECT * FROM t;\n \nBase tables and views share the same namespace within a\ndatabase, so a\ndatabase cannot contain a base table and a view that have\nthe same\nname.\n \nViews must have unique column names with no duplicates, just\nlike base\ntables. By default, the names of the columns retrieved by\nthe SELECT\nstatement are used for the view column names. To define\nexplicit names\nfor the view columns, the optional column_list clause can be\ngiven as\na list of comma-separated identifiers. The number of names\nin\ncolumn_list must be the same as the number of columns\nretrieved by the\nSELECT statement.\n \nMySQL until 5.1.28\n \nPrior to MySQL 5.1.29, When you modify an existing view, the\ncurrent view definition is backed up and saved. It is stored\nin that\ntable\'s database directory, in a subdirectory named arc.\nThe backup\nfile for a view v is named v.frm-00001. If you alter the\nview again,\nthe next backup is named v.frm-00002. The three latest view\nbackup\ndefinitions are stored. Backed up view definitions are not\npreserved\nby mysqldump, or any other such programs, but you can retain\nthem\nusing a file copy operation. However, they are not needed\nfor anything\nbut to provide you with a backup of your previous view\ndefinition. It\nis safe to remove these backup definitions, but only while\nmysqld is\nnot running. If you delete the arc subdirectory or its files\nwhile\nmysqld is running, you will receive an error the next time\nyou try to\nalter the view: \n \nMariaDB [test]> ALTER VIEW v AS SELECT * FROM t; \nERROR 6 (HY000): Error on delete of\n\'.\\test\\arc/v.frm-0004\' (Errcode: 2)\n \nColumns retrieved by the SELECT statement can be simple\nreferences to\ntable columns. They can also be expressions that use\nfunctions,\nconstant values, operators, and so forth.\n \nUnqualified table or view names in the SELECT statement are\ninterpreted with respect to the default database. A view can\nrefer to\ntables or views in other databases by qualifying the table\nor view\nname with the proper database name.\n \nA view can be created from many kinds of SELECT statements.\nIt can\nrefer to base tables or other views. It can use joins,\nUNION, and\nsubqueries. The SELECT need not even refer to any tables.\nThe\nfollowing example defines a view that selects two columns\nfrom another\ntable, as well as an expression calculated from those\ncolumns:\n \nCREATE TABLE t (qty INT, price INT);\n \nINSERT INTO t VALUES(3, 50);\n \nCREATE VIEW v AS SELECT qty, price, qty*price AS value FROM\nt;\n \nSELECT * FROM v;\n+------+-------+-------+\n| qty | price | value |\n+------+-------+-------+\n| 3 | 50 | 150 |\n+------+-------+-------+\n \nA view definition is subject to the following restrictions:\nThe SELECT statement cannot contain a subquery in the FROM\nclause.\nThe SELECT statement cannot refer to system or user\nvariables.\nWithin a stored program, the definition cannot refer to\nprogram parameters or local variables.\nThe SELECT statement cannot refer to prepared statement\nparameters.\nAny table or view referred to in the definition must exist.\nHowever, after a view has been created, it is possible to\ndrop a table or view that the definition refers to. In this\ncase, use of the view results in an error. To check a view\ndefinition for problems of this kind, use the CHECK TABLE\nstatement.\nThe definition cannot refer to a TEMPORARY table, and you\ncannot create a TEMPORARY view.\nAny tables named in the view definition must exist at\ndefinition time.\nYou cannot associate a trigger with a view.\nFor valid identifiers to use as view names, see Identifier\nNames.\n \nORDER BY is allowed in a view definition, but it is ignored\nif you\nselect from a view using a statement that has its own ORDER\nBY.\n \nFor other options or clauses in the definition, they are\nadded to the\noptions or clauses of the statement that references the\nview, but the\neffect is undefined. For example, if a view definition\nincludes a\nLIMIT clause, and you select from the view using a statement\nthat has\nits own LIMIT clause, it is undefined which limit applies.\nThis same\nprinciple applies to options such as ALL, DISTINCT, or\nSQL_SMALL_RESULT that follow the SELECT keyword, and to\nclauses such\nas INTO, FOR UPDATE, and LOCK IN SHARE MODE.\n \nThe PROCEDURE clause cannot be used in a view definition,\nand it cannot be used if a view is referenced in the FROM\nclause.\n \nIf you create a view and then change the query processing\nenvironment\nby changing system variables, that may affect the results\nthat you get\nfrom the view:\n \nCREATE VIEW v (mycol) AS SELECT \'abc\';\n \nSET sql_mode = \'\';\n \nSELECT \"mycol\" FROM v;\n+-------+\n| mycol |\n+-------+\n| mycol | \n+-------+\n \nSET sql_mode = \'ANSI_QUOTES\';\n \nSELECT \"mycol\" FROM v;\n+-------+\n| mycol |\n+-------+\n| abc | \n+-------+\n \nThe DEFINER and SQL SECURITY clauses determine which MariaDB\naccount to\nuse when checking access privileges for the view when a\nstatement is\nexecuted that references the view. They were added in MySQL\n5.1.2.\nThe legal SQL SECURITY characteristic values are DEFINER and\nINVOKER.\nThese indicate that the required privileges must be held by\nthe user\nwho defined or invoked the view, respectively. The default\nSQL\nSECURITY value is DEFINER.\n \nIf a user value is given for the DEFINER clause, it should\nbe a MariaDB\naccount in \'user_name\'@\'host_name\' format (the same\nformat used in the\nGRANT statement). The user_name and host_name values both\nare\nrequired. The definer can also be given as CURRENT_USER or\nCURRENT_USER(). The default DEFINER value is the user who\nexecutes the\nCREATE VIEW statement. This is the same as specifying\nDEFINER =\nCURRENT_USER explicitly.\n \nIf you specify the DEFINER clause, these rules determine the\nlegal\nDEFINER user values:\nIf you do not have the SUPER privilege, the only legal user\nvalue is your own account, either specified literally or by\nusing CURRENT_USER. You cannot set the definer to some other\naccount.\nIf you have the SUPER privilege, you can specify any\nsyntactically legal account name. If the account does not\nactually exist, a warning is generated.\nIf the SQL SECURITY value is DEFINER but the definer account\ndoes not exist when the view is referenced, an error occurs.\n \nWithin a view definition, CURRENT_USER returns the view\'s\nDEFINER\nvalue by default. Before MySQL 5.1.12, and for views\ndefined with the SQL SECURITY INVOKER characteristic,\nCURRENT_USER\nreturns the account for the view\'s invoker. For information\nabout user\nauditing within views, see\nhttp://dev.mysql.com/doc/refman/5.1/en/account-activity-auditing.html.\n \nWithin a stored routine that is defined with the SQL\nSECURITY DEFINER\ncharacteristic, CURRENT_USER returns the routine\'s DEFINER\nvalue. This\nalso affects a view defined within such a program, if the\nview\ndefinition contains a DEFINER value of CURRENT_USER.\n \nView privileges are checked like this:\nAt view definition time, the view creator must have the\nprivileges needed to use the top-level objects accessed by\nthe view. For example, if the view definition refers to\ntable columns, the creator must have privileges for the\ncolumns, as described previously. If the definition refers\nto a stored function, only the privileges needed to invoke\nthe function can be checked. The privileges required when\nthe function runs can be checked only as it executes: For\ndifferent invocations of the function, different execution\npaths within the function might be taken.\nWhen a view is referenced, privileges for objects accessed\nby the view are checked against the privileges held by the\nview creator or invoker, depending on whether the SQL\nSECURITY characteristic is DEFINER or INVOKER, respectively.\nIf reference to a view causes execution of a stored\nfunction, privilege checking for statements executed within\nthe function depend on whether the function is defined with\na SQL SECURITY characteristic of DEFINER or INVOKER. If the\nsecurity characteristic is DEFINER, the function runs with\nthe privileges of its creator. If the characteristic is\nINVOKER, the function runs with the privileges determined by\nthe view\'s SQL SECURITY characteristic.\n \nMySQL until 5.1.1\n \nPrior to MySQL 5.1.2 (before the DEFINER and SQL SECURITY\nclauses were\nimplemented), privileges required for objects used in a view\nare\nchecked at view creation time.\n \nExample: A view might depend on a stored function, and that\nfunction\nmight invoke other stored routines. For example, the\nfollowing view\ninvokes a stored function f():\n \nCREATE VIEW v AS SELECT * FROM t WHERE t.id = f(t.name);\n \nSuppose that f() contains a statement such as this:\n \nIF name IS NULL then\n CALL p1();\nELSE\n CALL p2();\nEND IF;\n \nThe privileges required for executing statements within f()\nneed to be\nchecked when f() executes. This might mean that privileges\nare needed\nfor p1() or p2(), depending on the execution path within\nf(). Those\nprivileges must be checked at runtime, and the user who must\npossess\nthe privileges is determined by the SQL SECURITY values of\nthe view v\nand the function f().\n \nThe DEFINER and SQL SECURITY clauses for views are\nextensions to\nstandard SQL. In standard SQL, views are handled using the\nrules for\nSQL SECURITY INVOKER.\n \nIf you invoke a view that was created before MySQL 5.1.2, it\nis\ntreated as though it was created with a SQL SECURITY DEFINER\nclause\nand with a DEFINER value that is the same as your account.\nHowever,\nbecause the actual definer is unknown, MySQL issues a\nwarning. To make\nthe warning go away, it is sufficient to re-create the view\nso that\nthe view definition includes a DEFINER clause.\n \nThe optional ALGORITHM clause is an extension to standard\nSQL. It\naffects how MariaDB processes the view. ALGORITHM takes\nthree values:\nMERGE, TEMPTABLE, or UNDEFINED. The default algorithm is\nUNDEFINED if\nno ALGORITHM clause is present. See View Algorithms for more\ninformation.\n \nSome views are updatable. That is, you can use them in\nstatements such\nas UPDATE, DELETE, or INSERT to update the contents of the\nunderlying\ntable. For a view to be updatable, there must be a\none-to-one\nrelationship between the rows in the view and the rows in\nthe\nunderlying table. There are also certain other constructs\nthat make a\nview non-updatable. See Inserting and Updating with Views.\n \nWITH CHECK OPTION\n \nThe WITH CHECK OPTION clause can be given for an updatable\nview to\nprevent inserts or updates to rows except those for which\nthe WHERE\nclause in the select_statement is true.\n \nIn a WITH CHECK OPTION clause for an updatable view, the\nLOCAL and\nCASCADED keywords determine the scope of check testing when\nthe view\nis defined in terms of another view. The LOCAL keyword\nrestricts the\nCHECK OPTION only to the view being defined. CASCADED causes\nthe\nchecks for underlying views to be evaluated as well. When\nneither\nkeyword is given, the default is CASCADED.\n \nFor more information about updatable views and the WITH\nCHECK OPTION\nclause, see\nInserting and Updating with Views.\n \nIF NOT EXISTS\n \nThe IF NOT EXISTS clause was added in MariaDB 10.1.3\n \nWhen the IF NOT EXISTS clause is used, MariaDB will return a\nwarning instead of an error if the specified view already\nexists. Cannot be used together with the OR REPLACE clause.\n \nExamples\n-------- \nCREATE TABLE t (a INT, b INT) ENGINE = InnoDB;\n \nINSERT INTO t VALUES (1,1), (2,2), (3,3);\n \nCREATE VIEW v AS SELECT a, a*2 AS a2 FROM t;\n \nSELECT * FROM v;\n \n+------+------+\n| a | a2 |\n+------+------+\n| 1 | 2 |\n| 2 | 4 |\n| 3 | 6 |\n+------+------+\n \nOR REPLACE and IF NOT EXISTS:\n \nCREATE VIEW v AS SELECT a, a*2 AS a2 FROM t;\n \nERROR 1050 (42S01): Table \'v\' already exists\n \nCREATE OR REPLACE VIEW v AS SELECT a, a*2 AS a2 FROM t;\n \nQuery OK, 0 rows affected (0.04 sec)\n \nCREATE VIEW IF NOT EXISTS v AS SELECT a, a*2 AS a2 FROM t;\n \nQuery OK, 0 rows affected, 1 warning (0.01 sec)\n \nSHOW WARNINGS;\n \n+-------+------+--------------------------+\n| Level | Code | Message |\n+-------+------+--------------------------+\n| Note | 1050 | Table \'v\' already exists |\n+-------+------+--------------------------+\n \n\n\nURL: https://mariadb.com/kb/en/library/create-view/','','https://mariadb.com/kb/en/library/create-view/'); diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql index 29f2a4c1ef6..34f552a3f35 100644 --- a/scripts/mysql_system_tables.sql +++ b/scripts/mysql_system_tables.sql @@ -20,8 +20,8 @@ set sql_mode=''; -set @orig_storage_engine=@@storage_engine; -set storage_engine=Aria; +set @orig_storage_engine=@@default_storage_engine; +set default_storage_engine=Aria; set system_versioning_alter_history=keep; @@ -313,7 +313,7 @@ PREPARE stmt FROM @str; EXECUTE stmt; DROP PREPARE stmt; -set storage_engine=@orig_storage_engine; +set default_storage_engine=@orig_storage_engine; -- -- Drop some tables not used anymore in MariaDB diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql index ba465bf576f..b452e55c1da 100644 --- a/scripts/mysql_system_tables_fix.sql +++ b/scripts/mysql_system_tables_fix.sql @@ -25,7 +25,7 @@ # adding a 'SHOW WARNINGS' after the statement. set sql_mode=''; -set storage_engine=Aria; +set default_storage_engine=Aria; set enforce_storage_engine=NULL; set @have_innodb= (select count(engine) from information_schema.engines where engine='INNODB' and support != 'NO'); diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 4dfec12ee29..8abd21da35a 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -3988,12 +3988,12 @@ static Sys_var_plugin Sys_default_storage_engine( MYSQL_STORAGE_ENGINE_PLUGIN, DEFAULT(&default_storage_engine), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_not_null)); -// Alias for @@default_storage_engine static Sys_var_plugin Sys_storage_engine( "storage_engine", "Alias for @@default_storage_engine. Deprecated", SESSION_VAR(table_plugin), NO_CMD_LINE, MYSQL_STORAGE_ENGINE_PLUGIN, DEFAULT(&default_storage_engine), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_not_null)); + NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_not_null), ON_UPDATE(0), + DEPRECATED("'@@default_storage_engine'")); // since 10.5.1 static Sys_var_plugin Sys_default_tmp_storage_engine( "default_tmp_storage_engine", "The default storage engine for user-created temporary tables", |