From: Bjorn Munch Date: November 6 2010 6:21pm Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3109) List-Archive: http://lists.mysql.com/commits/123022 Message-Id: <201011061821.oA6ILOem025081@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1595171560==" --===============1595171560== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #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 --===============1595171560== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/bjorn.munch@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: bjorn.munch@stripped # target_branch: file:///home/bm136801/my/vsconf-55/ # testament_sha1: 562cd101595dc997ed0dc4039993587c3e709618 # timestamp: 2010-11-06 19:21:24 +0100 # source_branch: file:///home/bm136801/my/ordpar-51/ # base_revision_id: bjorn.munch@stripped\ # tvluskcaj854takb # # Begin bundle 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 t0e8GMQjRcEldIrj+LuSKcKEhXqt78g= --===============1595171560==--