diff --git a/mysql-test/suite/innodb/r/innodb_bug12400341.result b/mysql-test/suite/innodb/r/innodb_bug12400341.result index 86eaa83980d..c382bd12616 100644 --- a/mysql-test/suite/innodb/r/innodb_bug12400341.result +++ b/mysql-test/suite/innodb/r/innodb_bug12400341.result @@ -1,4 +1,4 @@ -call mtr.add_suppression("InnoDB: Warning: cannot find a free slot for an undo log. Do you have too"); +call mtr.add_suppression("InnoDB: Warning: cannot find a free slot for an undo log. Do you have too*"); set @old_innodb_undo_logs = @@innodb_undo_logs; set global innodb_undo_logs=1; show variables like "max_connections"; diff --git a/mysql-test/suite/innodb/r/innodb_stats_fetch_nonexistent.result b/mysql-test/suite/innodb/r/innodb_stats_fetch_nonexistent.result index 4d1b8817bf1..befbb709c19 100644 --- a/mysql-test/suite/innodb/r/innodb_stats_fetch_nonexistent.result +++ b/mysql-test/suite/innodb/r/innodb_stats_fetch_nonexistent.result @@ -1,3 +1,4 @@ +call mtr.add_suppression("InnoDB: Error: Fetch of persistent statistics requested for table*"); CREATE TABLE test_ps_fetch_nonexistent (a INT, PRIMARY KEY (a)) ENGINE=INNODB STATS_PERSISTENT=1; diff --git a/mysql-test/suite/innodb/t/innodb-mdev7046.test b/mysql-test/suite/innodb/t/innodb-mdev7046.test index 24f1d3ab321..4033f284e65 100644 --- a/mysql-test/suite/innodb/t/innodb-mdev7046.test +++ b/mysql-test/suite/innodb/t/innodb-mdev7046.test @@ -9,6 +9,7 @@ # Ignore OS errors call mtr.add_suppression("InnoDB: File ./test/t1*"); call mtr.add_suppression("InnoDB: Error number*"); +call mtr.add_suppression("InnoDB: File ./test/t1#p#p1#sp#p1sp0.ibd: 'rename' returned OS error*"); # MDEV-7046: MySQL#74480 - Failing assertion: os_file_status(newpath, &exists, &type) # after Operating system error number 36 in a file operation diff --git a/mysql-test/suite/innodb/t/innodb_bug12400341.test b/mysql-test/suite/innodb/t/innodb_bug12400341.test index 173d42665be..a60a5104c3f 100644 --- a/mysql-test/suite/innodb/t/innodb_bug12400341.test +++ b/mysql-test/suite/innodb/t/innodb_bug12400341.test @@ -11,7 +11,10 @@ if (`select count(*)=0 from information_schema.global_variables where variable_n # and cause unstable result. --source include/not_valgrind.inc -call mtr.add_suppression("InnoDB: Warning: cannot find a free slot for an undo log. Do you have too"); +# Previous undo slots cause unnecessary failures +--source include/not_windows.inc + +call mtr.add_suppression("InnoDB: Warning: cannot find a free slot for an undo log. Do you have too*"); --disable_query_log set @old_innodb_trx_rseg_n_slots_debug = @@innodb_trx_rseg_n_slots_debug; diff --git a/mysql-test/suite/innodb/t/innodb_stats_fetch_nonexistent.test b/mysql-test/suite/innodb/t/innodb_stats_fetch_nonexistent.test index 6c7365c52d1..dbafb33965c 100644 --- a/mysql-test/suite/innodb/t/innodb_stats_fetch_nonexistent.test +++ b/mysql-test/suite/innodb/t/innodb_stats_fetch_nonexistent.test @@ -4,6 +4,8 @@ -- source include/have_innodb.inc +call mtr.add_suppression("InnoDB: Error: Fetch of persistent statistics requested for table*"); + -- vertical_results CREATE TABLE test_ps_fetch_nonexistent