diff --git a/mysql-test/suite/innodb/r/undo_leak_fail.result b/mysql-test/suite/innodb/r/undo_leak_fail.result index 6aa89ec7d3d..83b976f785c 100644 --- a/mysql-test/suite/innodb/r/undo_leak_fail.result +++ b/mysql-test/suite/innodb/r/undo_leak_fail.result @@ -43,7 +43,7 @@ NAME FILE_SIZE innodb_system 77594624 # restart: --debug_dbug=d,unused_undo_free_fail_1 # Fail to free the segment due to previous shutdown -FOUND 4 /InnoDB: Cannot free the unused segments in system tablespace because a previous shutdown was not with innodb_fast_shutdown=0/ in mysqld.1.err +FOUND 1 /InnoDB: Cannot free the unused segments in system tablespace because a previous shutdown was not with innodb_fast_shutdown=0.*/ in mysqld.1.err SELECT NAME, FILE_SIZE FROM information_schema.innodb_sys_tablespaces WHERE SPACE = 0; NAME FILE_SIZE innodb_system 15728640 diff --git a/mysql-test/suite/innodb/t/sys_truncate_debug.test b/mysql-test/suite/innodb/t/sys_truncate_debug.test index 20fa981685d..be70ea743e9 100644 --- a/mysql-test/suite/innodb/t/sys_truncate_debug.test +++ b/mysql-test/suite/innodb/t/sys_truncate_debug.test @@ -3,6 +3,8 @@ --source include/not_embedded.inc --source include/have_debug.inc --source include/not_windows.inc +# This test is extremely slow on Valgrind (exceeding 4 hours). +--source include/not_valgrind.inc call mtr.add_suppression("InnoDB: Cannot shrink the system tablespace"); call mtr.add_suppression("InnoDB: Plugin initialization aborted"); diff --git a/mysql-test/suite/innodb/t/sys_truncate_shutdown_debug.test b/mysql-test/suite/innodb/t/sys_truncate_shutdown_debug.test index 8e8c91e7b47..d819ebe42ee 100644 --- a/mysql-test/suite/innodb/t/sys_truncate_shutdown_debug.test +++ b/mysql-test/suite/innodb/t/sys_truncate_shutdown_debug.test @@ -2,6 +2,8 @@ --source include/have_sequence.inc --source include/not_embedded.inc --source include/have_debug.inc +# This test is extremely slow on Valgrind (exceeding 4 hours). +--source include/not_valgrind.inc call mtr.add_suppression("InnoDB: Cannot shrink the system tablespace"); call mtr.add_suppression("InnoDB: Plugin initialization aborted"); diff --git a/mysql-test/suite/innodb/t/temp_truncate_freed.test b/mysql-test/suite/innodb/t/temp_truncate_freed.test index 1ab054331d6..fc321c30d74 100644 --- a/mysql-test/suite/innodb/t/temp_truncate_freed.test +++ b/mysql-test/suite/innodb/t/temp_truncate_freed.test @@ -14,4 +14,6 @@ SET GLOBAL innodb_truncate_temporary_tablespace_now=1; SET GLOBAL innodb_buffer_pool_size=10485760; set global innodb_immediate_scrub_data_uncompressed = @old_immediate_scrub_data_val; +# this may occasionally be aborted on a heavily loaded builder +--error 0,ER_WRONG_USAGE set global innodb_buffer_pool_size = @old_innodb_buffer_pool_size; diff --git a/mysql-test/suite/innodb/t/undo_leak_fail.test b/mysql-test/suite/innodb/t/undo_leak_fail.test index 0346293eda2..30ca437025d 100644 --- a/mysql-test/suite/innodb/t/undo_leak_fail.test +++ b/mysql-test/suite/innodb/t/undo_leak_fail.test @@ -49,7 +49,7 @@ let $restart_parameters=--debug_dbug=d,unused_undo_free_fail_1; let $shutdown_timeout=; --echo # Fail to free the segment due to previous shutdown ---let SEARCH_PATTERN= InnoDB: Cannot free the unused segments in system tablespace because a previous shutdown was not with innodb_fast_shutdown=0 +--let SEARCH_PATTERN= InnoDB: Cannot free the unused segments in system tablespace because a previous shutdown was not with innodb_fast_shutdown=0.* let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err; --source include/search_pattern_in_file.inc