From: Libing Song
Date: January 4 2013 4:00am
Subject: bzr push into mysql-trunk branch (libing.song:5320 to 5321)
List-Archive: http://lists.mysql.com/commits/145564
Message-Id: <20130104040017.12674.27859.5321@mylaptop>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 5321 Libing Song	2013-01-04 [merge]
      Auto Merge

    modified:
      mysql-test/suite/rpl/r/rpl_parallel_switch_sequential.result
      mysql-test/suite/rpl/t/rpl_parallel_switch_sequential.test
 5320 Annamalai Gurusami	2013-01-03 [merge]
      Null merge from mysql-5.6 to mysql-5.7

=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_switch_sequential.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_switch_sequential.result	revid:annamalai.gurusami@stripped
+++ b/mysql-test/suite/rpl/r/rpl_parallel_switch_sequential.result	revid:libing.song@stripped
@@ -46,6 +46,6 @@ DROP DATABASE test_3;
 DROP DATABASE test_2;
 DROP DATABASE test_1;
 SET @@global.default_storage_engine= @save_default_storage_engine;
-include/stop_slave.inc
 SET @@global.default_storage_engine= @save_default_storage_engine;
 SET GLOBAL slave_parallel_workers= @save_slave_parallel_workers;
+include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_parallel_switch_sequential.test'
--- a/mysql-test/suite/rpl/t/rpl_parallel_switch_sequential.test	revid:annamalai.gurusami@stripped
+++ b/mysql-test/suite/rpl/t/rpl_parallel_switch_sequential.test	revid:libing.song@stripped
@@ -1,3 +1,4 @@
+--source include/big_test.inc
 --source include/master-slave.inc
 --source include/have_binlog_format_mixed_or_row.inc
 
@@ -151,8 +152,12 @@ while ($i) {
 
 SET @@global.default_storage_engine= @save_default_storage_engine;
 
---sync_slave_with_master
-
---source include/stop_slave.inc
+--connection slave
 SET @@global.default_storage_engine= @save_default_storage_engine;
 SET GLOBAL slave_parallel_workers= @save_slave_parallel_workers;
+
+# It may generate a big delay between master and slave, that will need more time
+# to sync data
+
+--let slave-timeout= 3600
+--source include/rpl_end.inc

No bundle (reason: useless for push emails).