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.

6 files changed, 18 insertions, 18 deletions

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