diff options
Diffstat (limited to 'mysql-test/suite/innodb/t')
4 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb/t/innodb-wl5522-debug-zip.test b/mysql-test/suite/innodb/t/innodb-wl5522-debug-zip.test index c61d10e8593..762b4758516 100644 --- a/mysql-test/suite/innodb/t/innodb-wl5522-debug-zip.test +++ b/mysql-test/suite/innodb/t/innodb-wl5522-debug-zip.test @@ -20,6 +20,7 @@ call mtr.add_suppression("InnoDB: Tablespace for table .* is set as discarded."); call mtr.add_suppression("InnoDB: Cannot calculate statistics for table .* because the .ibd file is missing. Please refer to .* for how to resolve the issue."); call mtr.add_suppression("InnoDB: Error: Tablespace flags .* corrupted unused .*"); +call mtr.add_suppression("InnoDB: Tablespace flags: .* corrupted in file: .* "); let MYSQLD_DATADIR =`SELECT @@datadir`; let $innodb_file_per_table = `SELECT @@innodb_file_per_table`; diff --git a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test index 79a00c27686..d129e866c8f 100644 --- a/mysql-test/suite/innodb/t/innodb.test +++ b/mysql-test/suite/innodb/t/innodb.test @@ -1141,7 +1141,7 @@ insert into t1 values (244, 243), (245, 244), (246, 245), (247, 246), (248, 247), (249, 248), (250, 249), (251, 250), (252, 251), (253, 252), (254, 253), (255, 254); ---error 1296,1451 +--error 4029,1451 delete from t1 where id=0; delete from t1 where id=255; --error 0,1451 diff --git a/mysql-test/suite/innodb/t/innodb_mysql-master.opt b/mysql-test/suite/innodb/t/innodb_mysql-master.opt index a177f285d66..a1ee2c096cf 100644 --- a/mysql-test/suite/innodb/t/innodb_mysql-master.opt +++ b/mysql-test/suite/innodb/t/innodb_mysql-master.opt @@ -1 +1,3 @@ ---loose-innodb-lock-wait-timeout=2 --default-storage-engine=MyISAM +--loose-innodb-lock-wait-timeout=2 +--default-storage-engine=MyISAM +--loose-innodb-large-prefix=off diff --git a/mysql-test/suite/innodb/t/innodb_simulate_comp_failures.test b/mysql-test/suite/innodb/t/innodb_simulate_comp_failures.test index cf22935fad6..5a4978c9b37 100644 --- a/mysql-test/suite/innodb/t/innodb_simulate_comp_failures.test +++ b/mysql-test/suite/innodb/t/innodb_simulate_comp_failures.test @@ -1,6 +1,7 @@ --source include/big_test.inc # test takes too long with valgrind --source include/not_valgrind.inc +--source include/have_debug.inc --let $num_inserts = 1500 --let $num_ops = 3500 --source suite/innodb/include/innodb_simulate_comp_failures.inc |