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/heap | |
| 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/heap')
| -rw-r--r-- | mysql-test/suite/heap/heap.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/heap/heap.test | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/suite/heap/heap.result b/mysql-test/suite/heap/heap.result index e8d1341aa9b..5e6cfde8410 100644 --- a/mysql-test/suite/heap/heap.result +++ b/mysql-test/suite/heap/heap.result @@ -249,7 +249,7 @@ a 3 2 drop table t1; -set storage_engine=HEAP; +set default_storage_engine=HEAP; create table t1 (v varchar(10), c char(10), t varchar(50)); insert into t1 values('+ ', '+ ', '+ '); set @a=repeat(' ',20); @@ -662,7 +662,7 @@ select length(v) from t1 where v=repeat('a',65530); length(v) 65530 drop table t1; -set storage_engine=MyISAM; +set default_storage_engine=MyISAM; create table t1 (a bigint unsigned auto_increment primary key, b int, key (b, a)) engine=heap; insert t1 (b) values (1),(1),(1),(1),(1),(1),(1),(1); diff --git a/mysql-test/suite/heap/heap.test b/mysql-test/suite/heap/heap.test index 237685a6423..ef950da5484 100644 --- a/mysql-test/suite/heap/heap.test +++ b/mysql-test/suite/heap/heap.test @@ -201,8 +201,8 @@ drop table t1; # We can't use varchar.inc becasue heap doesn't support blob's # -let $default=`select @@storage_engine`; -set storage_engine=HEAP; +let $default=`select @@default_storage_engine`; +set default_storage_engine=HEAP; # # Simple basic test that endspace is saved @@ -412,7 +412,7 @@ drop table t1; # # Reset varchar test # -eval set storage_engine=$default; +eval set default_storage_engine=$default; # # Bug #8489: Strange auto_increment behaviour |