diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2020-01-21 14:21:53 +0200 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2020-02-13 13:42:01 +0200 |
commit | fc5a4cfdf5ead679dac0937d6792ede11b2b3938 (patch) | |
tree | c2a168a76be0a34d5cf0b8b654577ab38fc0be0e /mysql-test | |
parent | 899056cfab0da22488572d7d923acd970b550739 (diff) | |
download | mariadb-git-fc5a4cfdf5ead679dac0937d6792ede11b2b3938.tar.gz |
MDEV-18650: Options deprecated in previous versions - old_alter_table
It was deprecated in 5.5 but it never issued a deprecation warning.
Make it issue a warning in 10.5.1.
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/main/alter_table.result | 4 | ||||
-rw-r--r-- | mysql-test/main/innodb_mysql_sync.result | 4 | ||||
-rw-r--r-- | mysql-test/suite/innodb/r/innodb_bug53592.result | 4 | ||||
-rw-r--r-- | mysql-test/suite/innodb_zip/r/bug53591.result | 2 | ||||
-rw-r--r-- | mysql-test/suite/sys_vars/r/old_alter_table_basic.result | 18 |
5 files changed, 32 insertions, 0 deletions
diff --git a/mysql-test/main/alter_table.result b/mysql-test/main/alter_table.result index 3d21b5c350d..44973141c2d 100644 --- a/mysql-test/main/alter_table.result +++ b/mysql-test/main/alter_table.result @@ -1679,6 +1679,8 @@ ALTER TABLE t1 DROP INDEX i1, DROP INDEX i2, DROP INDEX i3, DROP INDEX i4; # SET SESSION old_alter_table= 1; affected rows: 0 +Warnings: +Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead ALTER TABLE t1 ADD INDEX i1(b); affected rows: 2 info: Records: 2 Duplicates: 0 Warnings: 0 @@ -1699,6 +1701,8 @@ Warnings: Note 1831 Duplicate index `i4`. This is deprecated and will be disallowed in a future release SET SESSION old_alter_table= 0; affected rows: 0 +Warnings: +Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead ALTER TABLE t1 DROP INDEX i1, DROP INDEX i2, DROP INDEX i3, DROP INDEX i4; # # 3: Test unsupported in-place operation diff --git a/mysql-test/main/innodb_mysql_sync.result b/mysql-test/main/innodb_mysql_sync.result index 3f284edde86..46ed7d43830 100644 --- a/mysql-test/main/innodb_mysql_sync.result +++ b/mysql-test/main/innodb_mysql_sync.result @@ -450,6 +450,8 @@ info: Records: 0 Duplicates: 0 Warnings: 0 #table copy when the old_alter_table enabled. SET SESSION old_alter_table= TRUE; affected rows: 0 +Warnings: +Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead ALTER TABLE t1 FORCE; affected rows: 1 info: Records: 1 Duplicates: 0 Warnings: 0 @@ -474,6 +476,8 @@ SET DEBUG_SYNC= 'RESET'; affected rows: 0 SET SESSION old_alter_table= FALSE; affected rows: 0 +Warnings: +Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead #ALTER TABLE FORCE and ALTER TABLE ENGINE uses table copy #when ALGORITHM COPY is used. ALTER TABLE t1 FORCE, ALGORITHM= COPY; diff --git a/mysql-test/suite/innodb/r/innodb_bug53592.result b/mysql-test/suite/innodb/r/innodb_bug53592.result index 8befcbd48cd..9fea3deadd8 100644 --- a/mysql-test/suite/innodb/r/innodb_bug53592.result +++ b/mysql-test/suite/innodb/r/innodb_bug53592.result @@ -1,4 +1,6 @@ set old_alter_table=0; +Warnings: +Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead create table bug53592(a int) engine=innodb row_format=compact; alter table bug53592 add column b text charset utf8; alter table bug53592 add column c blob not null; @@ -13,6 +15,8 @@ Table Op Msg_type Msg_text test.bug53592 check status OK drop table bug53592; set old_alter_table=1; +Warnings: +Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead create table bug53592(a int) engine=innodb row_format=compact; alter table bug53592 add column b text charset utf8; alter table bug53592 add column c blob not null; diff --git a/mysql-test/suite/innodb_zip/r/bug53591.result b/mysql-test/suite/innodb_zip/r/bug53591.result index 0e0a5a05e4b..779064d054f 100644 --- a/mysql-test/suite/innodb_zip/r/bug53591.result +++ b/mysql-test/suite/innodb_zip/r/bug53591.result @@ -2,6 +2,8 @@ call mtr.add_suppression('InnoDB: Cannot add field.*because after adding it, the SET GLOBAL innodb_file_per_table=on; SET GLOBAL innodb_strict_mode=on; set old_alter_table=0; +Warnings: +Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead CREATE TABLE bug53591(a text charset utf8 not null) ENGINE=InnoDB KEY_BLOCK_SIZE=1; ALTER TABLE bug53591 ADD PRIMARY KEY(a(220)); diff --git a/mysql-test/suite/sys_vars/r/old_alter_table_basic.result b/mysql-test/suite/sys_vars/r/old_alter_table_basic.result index 8b668340d1a..3cc7fff79ba 100644 --- a/mysql-test/suite/sys_vars/r/old_alter_table_basic.result +++ b/mysql-test/suite/sys_vars/r/old_alter_table_basic.result @@ -21,7 +21,11 @@ select * from information_schema.session_variables where variable_name='old_alte VARIABLE_NAME VARIABLE_VALUE OLD_ALTER_TABLE DEFAULT set global old_alter_table=1; +Warnings: +Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead set session old_alter_table=1; +Warnings: +Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead select @@global.old_alter_table; @@global.old_alter_table COPY @@ -41,7 +45,11 @@ select * from information_schema.session_variables where variable_name='old_alte VARIABLE_NAME VARIABLE_VALUE OLD_ALTER_TABLE COPY set global old_alter_table=2; +Warnings: +Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead set session old_alter_table=2; +Warnings: +Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead select @@global.old_alter_table; @@global.old_alter_table INPLACE @@ -61,7 +69,11 @@ select * from information_schema.session_variables where variable_name='old_alte VARIABLE_NAME VARIABLE_VALUE OLD_ALTER_TABLE INPLACE set global old_alter_table=3; +Warnings: +Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead set session old_alter_table=3; +Warnings: +Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead select @@global.old_alter_table; @@global.old_alter_table NOCOPY @@ -81,7 +93,11 @@ select * from information_schema.session_variables where variable_name='old_alte VARIABLE_NAME VARIABLE_VALUE OLD_ALTER_TABLE NOCOPY set global old_alter_table=4; +Warnings: +Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead set session old_alter_table=4; +Warnings: +Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead select @@global.old_alter_table; @@global.old_alter_table INSTANT @@ -107,6 +123,8 @@ ERROR 42000: Incorrect argument type to variable 'old_alter_table' set global old_alter_table="foo"; ERROR 42000: Variable 'old_alter_table' can't be set to the value of 'foo' SET @@global.old_alter_table = @start_global_value; +Warnings: +Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead SELECT @@global.old_alter_table; @@global.old_alter_table DEFAULT |