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/suite/engines | |
| 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/suite/engines')
| -rw-r--r-- | mysql-test/suite/engines/rr_trx/include/rr_init.test | 6 | ||||
| -rw-r--r-- | mysql-test/suite/engines/rr_trx/r/init_innodb.result | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/suite/engines/rr_trx/include/rr_init.test b/mysql-test/suite/engines/rr_trx/include/rr_init.test index 05769bf70eb..7d08c4565e2 100644 --- a/mysql-test/suite/engines/rr_trx/include/rr_init.test +++ b/mysql-test/suite/engines/rr_trx/include/rr_init.test @@ -1,8 +1,8 @@ # # Specify storage engine to use. Variable $engine is set in wrapper test. # -eval SET @@storage_engine = $engine; -if (`SELECT @@storage_engine LIKE 'InnoDB' AND @@version LIKE '%6.%'`) +eval SET @@default_storage_engine = $engine; +if (`SELECT @@default_storage_engine LIKE 'InnoDB' AND @@version LIKE '%6.%'`) { # Need this due to Bug#43447 - Crash when executing SELECT ... LIMIT n FOR UPDATE query # Hopefully temporary... @@ -14,7 +14,7 @@ if (`SELECT @@storage_engine LIKE 'InnoDB' AND @@version LIKE '%6.%'`) } # Verify default storage engine. -SHOW VARIABLES LIKE 'storage_engine'; +SHOW VARIABLES LIKE 'default_storage_engine'; # Verify default isolation level SHOW VARIABLES LIKE 'tx_isolation'; diff --git a/mysql-test/suite/engines/rr_trx/r/init_innodb.result b/mysql-test/suite/engines/rr_trx/r/init_innodb.result index 6522adfd52b..292575a6610 100644 --- a/mysql-test/suite/engines/rr_trx/r/init_innodb.result +++ b/mysql-test/suite/engines/rr_trx/r/init_innodb.result @@ -1,5 +1,5 @@ -SET @@storage_engine = 'InnoDB'; -SHOW VARIABLES LIKE 'storage_engine'; +SET @@default_storage_engine = 'InnoDB'; +SHOW VARIABLES LIKE 'default_storage_engine'; Variable_name Value storage_engine InnoDB SHOW VARIABLES LIKE 'tx_isolation'; |