1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix tests to cleanup after themselves

Browse Source
This commit is contained in:
Sergei Golubchik 2014-02-06 16:27:55 +01:00
parent 3403f06d26
commit b7b991add0
10 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/extra/rpl_tests/rpl_ddl.test
View File

@ -608,6 +608,7 @@ use test;
--echo --echo
--echo -------- switch to master ------- --echo -------- switch to master -------
connection master; connection master;
DROP TEMPORARY TABLE mysqltest1.t22;
DROP DATABASE mysqltest1; DROP DATABASE mysqltest1;
# mysqltest2 was alreday DROPPED some tests before. # mysqltest2 was alreday DROPPED some tests before.
DROP DATABASE mysqltest3; DROP DATABASE mysqltest3;

1
mysql-test/r/partition_debug_sync.result
View File

@ -84,4 +84,5 @@ SELECT 1;
# Con1 # Con1
UNLOCK TABLES; UNLOCK TABLES;
# Default # Default
SET DEBUG_SYNC = 'RESET';
DROP TABLE t1, t2; DROP TABLE t1, t2;

1
mysql-test/suite/binlog/r/binlog_checkpoint.result
View File

@ -115,3 +115,4 @@ master-bin.000006 #
DROP TABLE t1, t2; DROP TABLE t1, t2;
SET GLOBAL max_binlog_size= @old_max_binlog_size; 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 GLOBAL innodb_flush_log_at_trx_commit= @old_innodb_flush_log_at_trx_commit;
SET debug_sync = 'reset';

1
mysql-test/suite/binlog/t/binlog_checkpoint.test
View File

@ -143,3 +143,4 @@ INSERT INTO t1 VALUES (31, REPEAT("x", 4100));
DROP TABLE t1, t2; DROP TABLE t1, t2;
SET GLOBAL max_binlog_size= @old_max_binlog_size; 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 GLOBAL innodb_flush_log_at_trx_commit= @old_innodb_flush_log_at_trx_commit;
SET debug_sync = 'reset';

1
mysql-test/suite/rpl/r/rpl_ddl.result
View File

@ -1617,6 +1617,7 @@ user
use test; use test;
-------- switch to master ------- -------- switch to master -------
DROP TEMPORARY TABLE mysqltest1.t22;
DROP DATABASE mysqltest1; DROP DATABASE mysqltest1;
DROP DATABASE mysqltest3; DROP DATABASE mysqltest3;
include/rpl_end.inc include/rpl_end.inc

2
mysql-test/suite/rpl/r/rpl_gtid_ignored.result
View File

@ -66,5 +66,7 @@ a
9 9
DROP TABLE t1; DROP TABLE t1;
SET GLOBAL gtid_strict_mode= @old_gtid_strict_mode; SET GLOBAL gtid_strict_mode= @old_gtid_strict_mode;
SET debug_sync = "reset";
SET GLOBAL gtid_strict_mode= @old_gtid_strict_mode; SET GLOBAL gtid_strict_mode= @old_gtid_strict_mode;
SET debug_sync = "reset";
include/rpl_end.inc include/rpl_end.inc

2
mysql-test/suite/rpl/r/rpl_parallel_no_log_slave_updates.result
View File

@ -116,7 +116,9 @@ SET GLOBAL slave_parallel_threads=10;
include/start_slave.inc include/start_slave.inc
include/stop_slave.inc include/stop_slave.inc
SET GLOBAL slave_parallel_threads=@old_parallel_threads; SET GLOBAL slave_parallel_threads=@old_parallel_threads;
SET debug_sync = 'reset';
include/start_slave.inc include/start_slave.inc
DROP function foo; DROP function foo;
DROP TABLE t3; DROP TABLE t3;
SET debug_sync = 'reset';
include/rpl_end.inc include/rpl_end.inc

4
mysql-test/suite/rpl/t/rpl_gtid_ignored.test
View File

@ -130,7 +130,11 @@ SELECT * FROM t1 ORDER BY a;
--connection server_1 --connection server_1
DROP TABLE t1; DROP TABLE t1;
SET GLOBAL gtid_strict_mode= @old_gtid_strict_mode; SET GLOBAL gtid_strict_mode= @old_gtid_strict_mode;
SET debug_sync = "reset";
--connection server_2 --connection server_2
SET GLOBAL gtid_strict_mode= @old_gtid_strict_mode; SET GLOBAL gtid_strict_mode= @old_gtid_strict_mode;
SET debug_sync = "reset";
--source include/rpl_end.inc --source include/rpl_end.inc

2
mysql-test/suite/rpl/t/rpl_parallel_no_log_slave_updates.test
View File

@ -190,10 +190,12 @@ SET GLOBAL slave_parallel_threads=10;
--connection server_2 --connection server_2
--source include/stop_slave.inc --source include/stop_slave.inc
SET GLOBAL slave_parallel_threads=@old_parallel_threads; SET GLOBAL slave_parallel_threads=@old_parallel_threads;
SET debug_sync = 'reset';
--source include/start_slave.inc --source include/start_slave.inc
--connection server_1 --connection server_1
DROP function foo; DROP function foo;
DROP TABLE t3; DROP TABLE t3;
SET debug_sync = 'reset';
--source include/rpl_end.inc --source include/rpl_end.inc

1
mysql-test/t/partition_debug_sync.test
View File

@ -131,5 +131,6 @@ UNLOCK TABLES;
--echo # Default --echo # Default
connection default; connection default;
SET DEBUG_SYNC = 'RESET';
DROP TABLE t1, t2; DROP TABLE t1, t2;