diff options
Diffstat (limited to 'mysql-test/t/partition_innodb_plugin.test')
| -rw-r--r-- | mysql-test/t/partition_innodb_plugin.test | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/mysql-test/t/partition_innodb_plugin.test b/mysql-test/t/partition_innodb_plugin.test index d25a4b95bf1..18ed0a27f96 100644 --- a/mysql-test/t/partition_innodb_plugin.test +++ b/mysql-test/t/partition_innodb_plugin.test @@ -3,6 +3,8 @@ let $MYSQLD_DATADIR= `SELECT @@datadir`; +call mtr.add_suppression("InnoDB: Table .* does not exist in the InnoDB internal data dictionary .*"); + --echo # --echo # Bug#11766879/Bug#60106: DIFF BETWEEN # OF INDEXES IN MYSQL VS INNODB, --echo # PARTITONING, ON INDEX CREATE @@ -34,14 +36,11 @@ call mtr.add_suppression("InnoDB: Error: table `test`.`t1` .* InnoDB internal"); --echo # --echo # Bug#55091: Server crashes on ADD PARTITION after a failed attempt --echo # -SET @old_innodb_file_format = @@global.innodb_file_format; SET @old_innodb_file_per_table = @@global.innodb_file_per_table; SET @old_innodb_strict_mode = @@global.innodb_strict_mode; -SET @@global.innodb_file_format = Barracuda, -@@global.innodb_file_per_table = ON, +SET @@global.innodb_file_per_table = ON, @@global.innodb_strict_mode = ON; ---echo # Connection con1 --connect(con1,localhost,root,,) CREATE TABLE t1 (id INT NOT NULL @@ -59,7 +58,6 @@ SET GLOBAL innodb_file_per_table = OFF; --disconnect con1 --connect(con2,localhost,root,,) ---echo # Connection con2 LOCK TABLE t1 WRITE; @@ -89,9 +87,7 @@ DROP TABLE t1; --disconnect con2 --connection default ---echo # Connection default SET @@global.innodb_strict_mode = @old_innodb_strict_mode; -SET @@global.innodb_file_format = @old_innodb_file_format; SET @@global.innodb_file_per_table = @old_innodb_file_per_table; # @@ -110,20 +106,16 @@ SUBPARTITION BY HASH (a) SUBPARTITION `sp3``\""e`)); INSERT INTO `t``\""e` VALUES (0), (2), (6), (10), (14), (18), (22); START TRANSACTION; ---echo # con1 connect(con1,localhost,root,,); SET NAMES utf8; START TRANSACTION; ---echo # default connection connection default; UPDATE `t``\""e` SET a = 16 WHERE a = 0; ---echo # con1 connection con1; UPDATE `t``\""e` SET a = 8 WHERE a = 22; let $id_1= `SELECT CONNECTION_ID()`; SEND; UPDATE `t``\""e` SET a = 12 WHERE a = 0; ---echo # default connection connection default; let $wait_condition= SELECT COUNT(*)=2 FROM INFORMATION_SCHEMA.INNODB_LOCKS; --source include/wait_condition.inc @@ -152,12 +144,9 @@ set sql_mode = 'ANSI_QUOTES'; --replace_regex /.*RECORD LOCKS space id [0-9]* page no [0-9]* n bits [0-9]* // / trx id .*// /.*index .* in // /trx table locks [0-9]* // /total table locks [0-9]* // SHOW ENGINE InnoDB STATUS; set @@sql_mode = @old_sql_mode; ---echo # con1 connection con1; REAP; ROLLBACK; disconnect con1; ---echo # default connection connection default; DROP TABLE `t``\""e`; -SET NAMES DEFAULT; |