Bug26848813: INDEXED COLUMN CAN'T BE CHANGED FROM VARCHAR(15)

TO VARCHAR(40) INSTANTANEOUSLY Post push fix for test case failure.
mysql · Jun 13, 2018 · f9064a4 · f9064a4
1 parent 6381595
commit f9064a4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/mysql-test/suite/innodb_zip/r/wl6469.result b/mysql-test/suite/innodb_zip/r/wl6469.result
@@ -281,6 +281,7 @@ b blob not null,
 index sk (b(3021))
 ) row_format = compact engine=innodb;
 ERROR 42000: Specified key was too long; max key length is 767 bytes
+SET sql_mode='NO_ENGINE_SUBSTITUTION';
 create temporary table t (
 a int not null,
 b blob not null,
@@ -293,6 +294,7 @@ b blob not null,
 index sk (b(3021))
 ) row_format = compressed engine=innodb;
 drop table t;
+SET sql_mode='NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES';
 SET GLOBAL innodb_large_prefix=default;
 set global innodb_file_per_table = 0;
 create temporary table t (
@@ -301,6 +303,7 @@ b blob not null,
 index sk (b(3021))
 ) row_format = compact engine=innodb;
 ERROR 42000: Specified key was too long; max key length is 767 bytes
+SET sql_mode='NO_ENGINE_SUBSTITUTION';
 create temporary table t (
 a int not null,
 b blob not null,

diff --git a/mysql-test/suite/innodb_zip/t/wl6469.test b/mysql-test/suite/innodb_zip/t/wl6469.test
@@ -228,6 +228,8 @@ create temporary table t (
 	b blob not null,
 	index sk (b(3021))
 	) row_format = compact engine=innodb;
+
+SET sql_mode='NO_ENGINE_SUBSTITUTION';
 #
 create temporary table t (
 	a int not null,
@@ -243,6 +245,7 @@ create temporary table t (
 	) row_format = compressed engine=innodb;
 drop table t;
 #
+SET sql_mode='NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES';
 SET GLOBAL innodb_large_prefix=default;
 set global innodb_file_per_table = 0;
 #
@@ -253,6 +256,7 @@ create temporary table t (
 	index sk (b(3021))
 	) row_format = compact engine=innodb;
 #
+SET sql_mode='NO_ENGINE_SUBSTITUTION';
 create temporary table t (
 	a int not null,
 	b blob not null,