bzr commit into mysql-5.5-mtr branch (bjorn.munch:3109)

[Bjorn Munch]

#At file:///home/bm136801/my/vsconf-55/ based on revid:bjorn.munch@stripped

 3109 Bjorn Munch	2010-11-06
      some test fixes after merging 57840

    added:
      mysql-test/suite/rpl/t/rpl_bug33931-master.opt
      mysql-test/suite/rpl/t/rpl_heartbeat-master.opt
      mysql-test/suite/rpl/t/rpl_ip_mix-master.opt
      mysql-test/suite/rpl/t/rpl_ip_mix2-master.opt
    modified:
      mysql-test/suite/rpl/r/rpl000017.result
      mysql-test/suite/rpl/r/rpl_slave_status.result
      mysql-test/suite/rpl/t/rpl000017.test
      mysql-test/suite/rpl/t/rpl_semi_sync-master.opt
      mysql-test/suite/rpl/t/rpl_slave_status.test
      mysql-test/suite/rpl/t/rpl_sync.test
      mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt
      mysql-test/t/union.test
=== modified file 'mysql-test/suite/rpl/r/rpl000017.result'
--- a/mysql-test/suite/rpl/r/rpl000017.result	2009-11-04 12:28:20 +0000
+++ b/mysql-test/suite/rpl/r/rpl000017.result	2010-11-06 18:21:12 +0000
@@ -13,3 +13,4 @@ n
 24
 drop table t1;
 delete from mysql.user where user="replicate";
+call mtr.force_restart();

=== modified file 'mysql-test/suite/rpl/r/rpl_slave_status.result'
--- a/mysql-test/suite/rpl/r/rpl_slave_status.result	2008-07-10 16:09:39 +0000
+++ b/mysql-test/suite/rpl/r/rpl_slave_status.result	2010-11-06 18:21:12 +0000
@@ -33,3 +33,4 @@ Slave_IO_Running = No (should be No)
 DROP TABLE t1;
 [on master]
 DROP TABLE t1;
+call mtr.force_restart();

=== modified file 'mysql-test/suite/rpl/t/rpl000017.test'
--- a/mysql-test/suite/rpl/t/rpl000017.test	2009-11-04 12:28:20 +0000
+++ b/mysql-test/suite/rpl/t/rpl000017.test	2010-11-06 18:21:12 +0000
@@ -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

=== added file 'mysql-test/suite/rpl/t/rpl_bug33931-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_bug33931-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_bug33931-master.opt	2010-11-06 18:21:12 +0000
@@ -0,0 +1 @@
+--force-restart

=== added file 'mysql-test/suite/rpl/t/rpl_heartbeat-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_heartbeat-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_heartbeat-master.opt	2010-11-06 18:21:12 +0000
@@ -0,0 +1 @@
+--force-restart

=== added file 'mysql-test/suite/rpl/t/rpl_ip_mix-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_ip_mix-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_ip_mix-master.opt	2010-11-06 18:21:12 +0000
@@ -0,0 +1 @@
+--force-restart

=== added file 'mysql-test/suite/rpl/t/rpl_ip_mix2-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_ip_mix2-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_ip_mix2-master.opt	2010-11-06 18:21:12 +0000
@@ -0,0 +1 @@
+--force-restart

=== modified file 'mysql-test/suite/rpl/t/rpl_semi_sync-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_semi_sync-master.opt	2009-09-30 08:09:31 +0000
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync-master.opt	2010-11-06 18:21:12 +0000
@@ -1 +1,2 @@
 $SEMISYNC_PLUGIN_OPT
+--force-restart

=== modified file 'mysql-test/suite/rpl/t/rpl_slave_status.test'
--- a/mysql-test/suite/rpl/t/rpl_slave_status.test	2009-10-02 09:24:21 +0000
+++ b/mysql-test/suite/rpl/t/rpl_slave_status.test	2010-11-06 18:21:12 +0000
@@ -68,3 +68,4 @@ DROP TABLE t1;
 --echo [on master]
 connection master;
 DROP TABLE t1;
+call mtr.force_restart();

=== modified file 'mysql-test/suite/rpl/t/rpl_sync.test'
--- a/mysql-test/suite/rpl/t/rpl_sync.test	2010-01-20 18:39:29 +0000
+++ b/mysql-test/suite/rpl/t/rpl_sync.test	2010-11-06 18:21:12 +0000
@@ -150,3 +150,4 @@ source include/diff_tables.inc;
 --echo =====Clean up=======;
 connection master;
 drop table t1;
+--remove_file $MYSQLD_SLAVE_DATADIR/master.backup

=== modified file 'mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt	2007-10-20 18:16:12 +0000
+++ b/mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt	2010-11-06 18:21:12 +0000
@@ -1,3 +1,2 @@
 --loose-debug="+d,all_errors_are_temporary_errors" --slave-transaction-retries=2
-
-
+--force-restart

=== modified file 'mysql-test/t/union.test'
--- a/mysql-test/t/union.test	2010-08-18 09:35:41 +0000
+++ b/mysql-test/t/union.test	2010-11-06 18:21:12 +0000
@@ -1062,7 +1062,7 @@ SELECT ( SELECT a UNION SELECT a ) INTO
 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 


Attachment: [text/bzr-bundle] bzr/[e-mail]