diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2020-01-13 21:07:04 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2020-02-13 13:42:01 +0200 |
| commit | 45bc7574fba26f3f975379b73d80235081c4d397 (patch) | |
| tree | 0cb57bc82a6e908c4c40f4ac913ae752de6c1d2f /mysql-test/suite | |
| parent | 415797f1a67d5281c4e585ac3dc82b10e5dcbd16 (diff) | |
| download | mariadb-git-45bc7574fba26f3f975379b73d80235081c4d397.tar.gz | |
MDEV-18650: Options deprecated in previous versions - storage_engine
Remove usage of deprecated variable storage_engine. It was deprecated in 5.5 but
it never issued a deprecation warning. Make it issue a warning in 10.5.1.
Replaced with default_storage_engine.
Diffstat (limited to 'mysql-test/suite')
141 files changed, 245 insertions, 211 deletions
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 |