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/main/merge_debug.result | |
| 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/main/merge_debug.result')
| -rw-r--r-- | mysql-test/main/merge_debug.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/main/merge_debug.result b/mysql-test/main/merge_debug.result index 29858810ff1..36cf254f87e 100644 --- a/mysql-test/main/merge_debug.result +++ b/mysql-test/main/merge_debug.result @@ -1,6 +1,6 @@ -set @default_storage_engine= @@global.storage_engine; -set global storage_engine=myisam; -set session storage_engine=myisam; +set @default_storage_engine= @@global.default_storage_engine; +set global default_storage_engine=myisam; +set session default_storage_engine=myisam; call mtr.add_suppression("Index for table .*crashed' is corrupt; try to repair it"); drop table if exists crashed,t2,t3,t4; SET @orig_debug=@@global.debug_dbug; @@ -24,4 +24,4 @@ INSERT INTO t3 VALUES (31); UNLOCK TABLES; DROP TRIGGER t1_ai; DROP TABLE t4,crashed,t2,t3; -set global storage_engine=@default_storage_engine; +set global default_storage_engine=@default_storage_engine; |