List:Commits« Previous MessageNext Message »
From:Libing Song Date:January 27 2013 3:58pm
Subject:bzr push into mysql-5.6 branch (libing.song:4674)
View as plain text  
 4674 Libing Song	2013-01-27 [merge]
      Auto Merge

    modified:
      sql/log_event.h
      sql/rpl_rli.h
      sql/rpl_slave.cc
      sql/rpl_utility.cc
      sql/rpl_utility.h
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	revid:venkatesh.duggirala@stripped
+++ b/mysql-test/collections/default.experimental	revid:libing.song@stripped
@@ -15,7 +15,6 @@ innodb.innodb_monitor
 rpl.rpl_delayed_slave                    # BUG#11764654 rpl_delayed_slave fails sporadically in pb
 rpl.rpl_innodb_bug28430                  # Bug#11754425
 rpl.rpl_show_slave_running               # BUG#12346048 2011-04-11 sven fails sporadically on pb2
-rpl.rpl_parallel_switch_sequential       # BUG#13626976 2012-02-07 dlenev Fails sporadically on pb2
 
 sys_vars.rpl_init_slave_func		 # Bug#12535301 2011-05-09 andrei sys_vars.rpl_init_slave_func mismatches in daily-5.5
 

=== modified file 'mysql-test/suite/rpl/t/rpl_parallel_switch_sequential.test'
--- a/mysql-test/suite/rpl/t/rpl_parallel_switch_sequential.test	revid:venkatesh.duggirala@stripped
+++ b/mysql-test/suite/rpl/t/rpl_parallel_switch_sequential.test	revid:libing.song@stripped
@@ -139,7 +139,6 @@ while ($i) {
 --disable_warnings
 --source include/start_slave.inc
 --enable_warnings
---sync_with_master
 
 #cleanup
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.6 branch (libing.song:4674) Libing Song14 Mar