From b541611cb90c3008cc7cbd3d908dcdbde0493727 Mon Sep 17 00:00:00 2001 From: Bjorn Munch <bjorn.munch@oracle.com> Date: Sat, 6 Nov 2010 19:21:12 +0100 Subject: [PATCH] some test fixes after merging 57840 --- mysql-test/suite/rpl/r/rpl000017.result | 1 + mysql-test/suite/rpl/r/rpl_slave_status.result | 1 + mysql-test/suite/rpl/t/rpl000017.test | 2 ++ mysql-test/suite/rpl/t/rpl_bug33931-master.opt | 1 + mysql-test/suite/rpl/t/rpl_heartbeat-master.opt | 1 + mysql-test/suite/rpl/t/rpl_ip_mix-master.opt | 1 + mysql-test/suite/rpl/t/rpl_ip_mix2-master.opt | 1 + mysql-test/suite/rpl/t/rpl_semi_sync-master.opt | 1 + mysql-test/suite/rpl/t/rpl_slave_status.test | 1 + mysql-test/suite/rpl/t/rpl_sync.test | 1 + mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt | 3 +-- mysql-test/t/union.test | 2 +- 12 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 mysql-test/suite/rpl/t/rpl_bug33931-master.opt create mode 100644 mysql-test/suite/rpl/t/rpl_heartbeat-master.opt create mode 100644 mysql-test/suite/rpl/t/rpl_ip_mix-master.opt create mode 100644 mysql-test/suite/rpl/t/rpl_ip_mix2-master.opt diff --git a/mysql-test/suite/rpl/r/rpl000017.result b/mysql-test/suite/rpl/r/rpl000017.result index 403f4d4d4fe..39f46c41217 100644 --- a/mysql-test/suite/rpl/r/rpl000017.result +++ b/mysql-test/suite/rpl/r/rpl000017.result @@ -13,3 +13,4 @@ n 24 drop table t1; delete from mysql.user where user="replicate"; +call mtr.force_restart(); diff --git a/mysql-test/suite/rpl/r/rpl_slave_status.result b/mysql-test/suite/rpl/r/rpl_slave_status.result index a98a81dc74f..315008d559a 100644 --- a/mysql-test/suite/rpl/r/rpl_slave_status.result +++ b/mysql-test/suite/rpl/r/rpl_slave_status.result @@ -33,3 +33,4 @@ Slave_IO_Running = No (should be No) DROP TABLE t1; [on master] DROP TABLE t1; +call mtr.force_restart(); diff --git a/mysql-test/suite/rpl/t/rpl000017.test b/mysql-test/suite/rpl/t/rpl000017.test index a65189657cc..d271ba49c68 100644 --- a/mysql-test/suite/rpl/t/rpl000017.test +++ b/mysql-test/suite/rpl/t/rpl000017.test @@ -31,4 +31,6 @@ drop table t1; delete from mysql.user where user="replicate"; sync_slave_with_master; +call mtr.force_restart(); + # End of 4.1 tests diff --git a/mysql-test/suite/rpl/t/rpl_bug33931-master.opt b/mysql-test/suite/rpl/t/rpl_bug33931-master.opt new file mode 100644 index 00000000000..cef79bc8585 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_bug33931-master.opt @@ -0,0 +1 @@ +--force-restart diff --git a/mysql-test/suite/rpl/t/rpl_heartbeat-master.opt b/mysql-test/suite/rpl/t/rpl_heartbeat-master.opt new file mode 100644 index 00000000000..cef79bc8585 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_heartbeat-master.opt @@ -0,0 +1 @@ +--force-restart diff --git a/mysql-test/suite/rpl/t/rpl_ip_mix-master.opt b/mysql-test/suite/rpl/t/rpl_ip_mix-master.opt new file mode 100644 index 00000000000..cef79bc8585 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_ip_mix-master.opt @@ -0,0 +1 @@ +--force-restart diff --git a/mysql-test/suite/rpl/t/rpl_ip_mix2-master.opt b/mysql-test/suite/rpl/t/rpl_ip_mix2-master.opt new file mode 100644 index 00000000000..cef79bc8585 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_ip_mix2-master.opt @@ -0,0 +1 @@ +--force-restart diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync-master.opt b/mysql-test/suite/rpl/t/rpl_semi_sync-master.opt index 58029d28ace..1e8eb90679e 100644 --- a/mysql-test/suite/rpl/t/rpl_semi_sync-master.opt +++ b/mysql-test/suite/rpl/t/rpl_semi_sync-master.opt @@ -1 +1,2 @@ $SEMISYNC_PLUGIN_OPT +--force-restart diff --git a/mysql-test/suite/rpl/t/rpl_slave_status.test b/mysql-test/suite/rpl/t/rpl_slave_status.test index 02fd555d13c..9601062b65f 100644 --- a/mysql-test/suite/rpl/t/rpl_slave_status.test +++ b/mysql-test/suite/rpl/t/rpl_slave_status.test @@ -68,3 +68,4 @@ DROP TABLE t1; --echo [on master] connection master; DROP TABLE t1; +call mtr.force_restart(); diff --git a/mysql-test/suite/rpl/t/rpl_sync.test b/mysql-test/suite/rpl/t/rpl_sync.test index 48c8dc02efb..4ec02325572 100644 --- a/mysql-test/suite/rpl/t/rpl_sync.test +++ b/mysql-test/suite/rpl/t/rpl_sync.test @@ -150,3 +150,4 @@ source include/diff_tables.inc; --echo =====Clean up=======; connection master; drop table t1; +--remove_file $MYSQLD_SLAVE_DATADIR/master.backup diff --git a/mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt b/mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt index 80c171170f6..b37427aa2cd 100644 --- a/mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt +++ b/mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt @@ -1,3 +1,2 @@ --loose-debug="+d,all_errors_are_temporary_errors" --slave-transaction-retries=2 - - +--force-restart diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test index 93dc4cad50c..596fc5f41ef 100644 --- a/mysql-test/t/union.test +++ b/mysql-test/t/union.test @@ -1062,7 +1062,7 @@ SELECT ( SELECT a UNION SELECT a ) INTO OUTFILE 'union.out.file3' FROM t1; SELECT ( SELECT a UNION SELECT a ) INTO DUMPFILE 'union.out.file4' FROM t1; DROP TABLE t1; - +remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.1/data/test union.out.fil*; --echo # --echo # Bug #49734: Crash on EXPLAIN EXTENDED UNION ... ORDER BY -- 2.30.9