List:Commits« Previous MessageNext Message »
From:Sven Sandberg Date:December 19 2010 2:20pm
Subject:bzr commit into mysql-trunk-bugfixing branch (sven.sandberg:3448) Bug#59037
View as plain text  
#At file:///home/sven/bzr/b49978-cleanup_rpl_tests/2/trunk-bugfixing/ based on revid:sven.sandberg@stripped

 3448 Sven Sandberg	2010-12-19 [merge]
      Merged patch that disabled part of rpl_change_master
      due to BUG#59037 from 5.5-bugteam to trunk-bugfixing.

    modified:
      mysql-test/extra/rpl_tests/rpl_change_master.test
=== modified file 'mysql-test/extra/rpl_tests/rpl_change_master.test'
--- a/mysql-test/extra/rpl_tests/rpl_change_master.test	2010-12-18 19:40:22 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_change_master.test	2010-12-19 14:19:38 +0000
@@ -52,6 +52,7 @@ sync_slave_with_master;
 # BUG#12190 CHANGE MASTER has differ path requiremts on MASTER_LOG_FILE and RELAY_LOG_FILE
 #
 
+if (!$bug_59037_is_fixed) {
 --source include/rpl_reset.inc
 
 connection master;
@@ -98,6 +99,7 @@ eval set global relay_log_purge=$relay_l
 connection master;
 drop table t1;
 sync_slave_with_master;
+}
 
 #
 # BUG#44209: MASTER_CONNECT_RETRY and --master-retry-count disconnected from each other

No bundle (reason: revision is a merge).
Thread
bzr commit into mysql-trunk-bugfixing branch (sven.sandberg:3448) Bug#59037Sven Sandberg19 Dec