diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-06 16:27:55 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-06 16:27:55 +0100 |
| commit | b7b991add01a0bb546c3f19e37add13c4e6854fc (patch) | |
| tree | 0bccefb5d7171ec1b699696bdeda9407c30a7ad7 /mysql-test/suite | |
| parent | 3403f06d2681f2d283b91480687252acf3fdb030 (diff) | |
| download | mariadb-git-b7b991add01a0bb546c3f19e37add13c4e6854fc.tar.gz | |
fix tests to cleanup after themselves
Diffstat (limited to 'mysql-test/suite')
7 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_checkpoint.result b/mysql-test/suite/binlog/r/binlog_checkpoint.result index 8a57b26ebb0..2ce9ed760f5 100644 --- a/mysql-test/suite/binlog/r/binlog_checkpoint.result +++ b/mysql-test/suite/binlog/r/binlog_checkpoint.result @@ -115,3 +115,4 @@ master-bin.000006 # DROP TABLE t1, t2; SET GLOBAL max_binlog_size= @old_max_binlog_size; SET GLOBAL innodb_flush_log_at_trx_commit= @old_innodb_flush_log_at_trx_commit; +SET debug_sync = 'reset'; diff --git a/mysql-test/suite/binlog/t/binlog_checkpoint.test b/mysql-test/suite/binlog/t/binlog_checkpoint.test index 4fa40b23547..356f860af32 100644 --- a/mysql-test/suite/binlog/t/binlog_checkpoint.test +++ b/mysql-test/suite/binlog/t/binlog_checkpoint.test @@ -143,3 +143,4 @@ INSERT INTO t1 VALUES (31, REPEAT("x", 4100)); DROP TABLE t1, t2; SET GLOBAL max_binlog_size= @old_max_binlog_size; SET GLOBAL innodb_flush_log_at_trx_commit= @old_innodb_flush_log_at_trx_commit; +SET debug_sync = 'reset'; diff --git a/mysql-test/suite/rpl/r/rpl_ddl.result b/mysql-test/suite/rpl/r/rpl_ddl.result index 246ae3790a6..0173bf1e28d 100644 --- a/mysql-test/suite/rpl/r/rpl_ddl.result +++ b/mysql-test/suite/rpl/r/rpl_ddl.result @@ -1617,6 +1617,7 @@ user use test; -------- switch to master ------- +DROP TEMPORARY TABLE mysqltest1.t22; DROP DATABASE mysqltest1; DROP DATABASE mysqltest3; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_gtid_ignored.result b/mysql-test/suite/rpl/r/rpl_gtid_ignored.result index 7d6e65bcb6f..80df3af9232 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_ignored.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_ignored.result @@ -66,5 +66,7 @@ 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; +SET debug_sync = "reset"; 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..0f0b6c9f02a 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 @@ -116,7 +116,9 @@ SET GLOBAL slave_parallel_threads=10; include/start_slave.inc include/stop_slave.inc SET GLOBAL slave_parallel_threads=@old_parallel_threads; +SET debug_sync = 'reset'; include/start_slave.inc DROP function foo; DROP TABLE t3; +SET debug_sync = 'reset'; 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..cb98be3c838 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_ignored.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_ignored.test @@ -130,7 +130,11 @@ SELECT * FROM t1 ORDER BY a; --connection server_1 DROP TABLE t1; SET GLOBAL gtid_strict_mode= @old_gtid_strict_mode; +SET debug_sync = "reset"; + --connection server_2 SET GLOBAL gtid_strict_mode= @old_gtid_strict_mode; +SET debug_sync = "reset"; --source include/rpl_end.inc + 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..75db619d225 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 @@ -190,10 +190,12 @@ SET GLOBAL slave_parallel_threads=10; --connection server_2 --source include/stop_slave.inc SET GLOBAL slave_parallel_threads=@old_parallel_threads; +SET debug_sync = 'reset'; --source include/start_slave.inc --connection server_1 DROP function foo; DROP TABLE t3; +SET debug_sync = 'reset'; --source include/rpl_end.inc |