From f3a6f86ec3452b346de513075f72dbd02549a5fb Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 10 Feb 2014 12:53:04 +0100 Subject: [PATCH] Fix check_testcase complaints due to missing SET debug_sync=RESET in a few tests. --- mysql-test/suite/binlog/r/binlog_checkpoint.result | 1 + mysql-test/suite/binlog/t/binlog_checkpoint.test | 1 + mysql-test/suite/rpl/r/rpl_gtid_ignored.result | 1 + mysql-test/suite/rpl/r/rpl_parallel.result | 2 ++ mysql-test/suite/rpl/r/rpl_parallel_no_log_slave_updates.result | 2 ++ mysql-test/suite/rpl/t/rpl_gtid_ignored.test | 1 + mysql-test/suite/rpl/t/rpl_parallel.test | 2 ++ mysql-test/suite/rpl/t/rpl_parallel_no_log_slave_updates.test | 2 ++ 8 files changed, 12 insertions(+) diff --git a/mysql-test/suite/binlog/r/binlog_checkpoint.result b/mysql-test/suite/binlog/r/binlog_checkpoint.result index 3444b9a24b3..016996f8a7b 100644 --- a/mysql-test/suite/binlog/r/binlog_checkpoint.result +++ b/mysql-test/suite/binlog/r/binlog_checkpoint.result @@ -113,5 +113,6 @@ master-bin.000004 # master-bin.000005 # master-bin.000006 # DROP TABLE t1, t2; +SET debug_sync = "RESET"; SET GLOBAL max_binlog_size= @old_max_binlog_size; SET GLOBAL innodb_flush_log_at_trx_commit= @old_innodb_flush_log_at_trx_commit; diff --git a/mysql-test/suite/binlog/t/binlog_checkpoint.test b/mysql-test/suite/binlog/t/binlog_checkpoint.test index 4fa40b23547..aa012415047 100644 --- a/mysql-test/suite/binlog/t/binlog_checkpoint.test +++ b/mysql-test/suite/binlog/t/binlog_checkpoint.test @@ -141,5 +141,6 @@ INSERT INTO t1 VALUES (31, REPEAT("x", 4100)); DROP TABLE t1, t2; +SET debug_sync = "RESET"; SET GLOBAL max_binlog_size= @old_max_binlog_size; SET GLOBAL innodb_flush_log_at_trx_commit= @old_innodb_flush_log_at_trx_commit; diff --git a/mysql-test/suite/rpl/r/rpl_gtid_ignored.result b/mysql-test/suite/rpl/r/rpl_gtid_ignored.result index 7d6e65bcb6f..a0fcbc99a5b 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_ignored.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_ignored.result @@ -66,5 +66,6 @@ a 9 DROP TABLE t1; SET GLOBAL gtid_strict_mode= @old_gtid_strict_mode; +SET debug_sync = "RESET"; SET GLOBAL gtid_strict_mode= @old_gtid_strict_mode; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_parallel.result b/mysql-test/suite/rpl/r/rpl_parallel.result index 7a9fd69b2fb..2ff6bd7cbe1 100644 --- a/mysql-test/suite/rpl/r/rpl_parallel.result +++ b/mysql-test/suite/rpl/r/rpl_parallel.result @@ -671,8 +671,10 @@ SET GLOBAL slave_parallel_threads=0; SET GLOBAL slave_parallel_threads=10; include/start_slave.inc include/stop_slave.inc +SET debug_sync = "RESET"; SET GLOBAL slave_parallel_threads=@old_parallel_threads; include/start_slave.inc +SET debug_sync = "RESET"; DROP function foo; DROP TABLE t1,t2,t3; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_parallel_no_log_slave_updates.result b/mysql-test/suite/rpl/r/rpl_parallel_no_log_slave_updates.result index 067d92a962f..2a4c751ad40 100644 --- a/mysql-test/suite/rpl/r/rpl_parallel_no_log_slave_updates.result +++ b/mysql-test/suite/rpl/r/rpl_parallel_no_log_slave_updates.result @@ -115,8 +115,10 @@ SET GLOBAL slave_parallel_threads=0; SET GLOBAL slave_parallel_threads=10; include/start_slave.inc include/stop_slave.inc +SET debug_sync = "RESET"; SET GLOBAL slave_parallel_threads=@old_parallel_threads; include/start_slave.inc +SET debug_sync = "RESET"; DROP function foo; DROP TABLE t3; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_gtid_ignored.test b/mysql-test/suite/rpl/t/rpl_gtid_ignored.test index ee5ca92b55e..4ed78997104 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_ignored.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_ignored.test @@ -131,6 +131,7 @@ SELECT * FROM t1 ORDER BY a; DROP TABLE t1; SET GLOBAL gtid_strict_mode= @old_gtid_strict_mode; --connection server_2 +SET debug_sync = "RESET"; SET GLOBAL gtid_strict_mode= @old_gtid_strict_mode; --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_parallel.test b/mysql-test/suite/rpl/t/rpl_parallel.test index a0232ac71e0..72a0a72db7d 100644 --- a/mysql-test/suite/rpl/t/rpl_parallel.test +++ b/mysql-test/suite/rpl/t/rpl_parallel.test @@ -1020,10 +1020,12 @@ SET GLOBAL slave_parallel_threads=10; --connection server_2 --source include/stop_slave.inc +SET debug_sync = "RESET"; SET GLOBAL slave_parallel_threads=@old_parallel_threads; --source include/start_slave.inc --connection server_1 +SET debug_sync = "RESET"; DROP function foo; DROP TABLE t1,t2,t3; diff --git a/mysql-test/suite/rpl/t/rpl_parallel_no_log_slave_updates.test b/mysql-test/suite/rpl/t/rpl_parallel_no_log_slave_updates.test index 98f919e4727..21187304737 100644 --- a/mysql-test/suite/rpl/t/rpl_parallel_no_log_slave_updates.test +++ b/mysql-test/suite/rpl/t/rpl_parallel_no_log_slave_updates.test @@ -189,10 +189,12 @@ SET GLOBAL slave_parallel_threads=10; --connection server_2 --source include/stop_slave.inc +SET debug_sync = "RESET"; SET GLOBAL slave_parallel_threads=@old_parallel_threads; --source include/start_slave.inc --connection server_1 +SET debug_sync = "RESET"; DROP function foo; DROP TABLE t3;