summaryrefslogtreecommitdiff
path: root/mysql-test/main/innodb_mrr_cpk.test
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2020-01-13 21:07:04 +0200
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2020-02-13 13:42:01 +0200
commit45bc7574fba26f3f975379b73d80235081c4d397 (patch)
tree0cb57bc82a6e908c4c40f4ac913ae752de6c1d2f /mysql-test/main/innodb_mrr_cpk.test
parent415797f1a67d5281c4e585ac3dc82b10e5dcbd16 (diff)
downloadmariadb-git-45bc7574fba26f3f975379b73d80235081c4d397.tar.gz
MDEV-18650: Options deprecated in previous versions - storage_engine
Remove usage of deprecated variable storage_engine. It was deprecated in 5.5 but it never issued a deprecation warning. Make it issue a warning in 10.5.1. Replaced with default_storage_engine.
Diffstat (limited to 'mysql-test/main/innodb_mrr_cpk.test')
-rw-r--r--mysql-test/main/innodb_mrr_cpk.test6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/main/innodb_mrr_cpk.test b/mysql-test/main/innodb_mrr_cpk.test
index cb79c238f2b..cbebafd3053 100644
--- a/mysql-test/main/innodb_mrr_cpk.test
+++ b/mysql-test/main/innodb_mrr_cpk.test
@@ -23,8 +23,8 @@ set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on';
set @save_join_cache_level=@@join_cache_level;
set join_cache_level=6;
-set @save_storage_engine=@@storage_engine;
-set storage_engine=innodb;
+set @save_storage_engine=@@default_storage_engine;
+set default_storage_engine=innodb;
create table t0(a int);
insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
@@ -225,5 +225,5 @@ drop table t0,t1,t2;
--echo #
set @@join_cache_level= @save_join_cache_level;
-set storage_engine=@save_storage_engine;
+set default_storage_engine=@save_storage_engine;
set optimizer_switch=@innodb_mrr_cpk_tmp;