1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

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.
This commit is contained in:
Vicențiu Ciorbaru
2020-01-13 21:07:04 +02:00
parent 415797f1a6
commit 45bc7574fb
260 changed files with 802 additions and 768 deletions

View File

@@ -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.