diff options
Diffstat (limited to 'mysql-test/suite/maria')
28 files changed, 66 insertions, 66 deletions
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; |