From: Manish Kumar
Date: December 4 2012 12:49pm
Subject: bzr push into mysql-5.6 branch (manish.4.kumar:4717 to 4718)
 Bug#13812374
List-Archive: http://lists.mysql.com/commits/145433
X-Bug: 13812374
Message-Id: <201212041250.qB4CoPQB024224@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

 4718 Manish Kumar	2012-12-04 [merge]
      BUG#13812374 - RPL.RPL_REPORT_PORT FAILS OCCASIONALLY ON PB2
      
      Upmerge from 5.5 -> 5.6

    modified:
      mysql-test/collections/default.experimental
      mysql-test/suite/rpl/r/rpl_report_port.result
      mysql-test/suite/rpl/t/rpl_report_port.test
 4717 Mattias Jonsson	2012-12-04
      post push test fix for bug#14760210

    modified:
      mysql-test/suite/parts/r/partition_debug_innodb.result
      mysql-test/suite/parts/t/partition_debug_innodb.test
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	revid:mattias.jonsson@stripped
+++ b/mysql-test/collections/default.experimental	revid:manish.4.kumar@stripped
@@ -18,7 +18,6 @@ rpl.rpl_delayed_slave
 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
-rpl.rpl_report_port                      # BUG#13812374 2012-05-10 Hemant Fails after the post fix for bug#13812374
 
 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/r/rpl_report_port.result'
--- a/mysql-test/suite/rpl/r/rpl_report_port.result	revid:mattias.jonsson@stripped
+++ b/mysql-test/suite/rpl/r/rpl_report_port.result	revid:manish.4.kumar@stripped
@@ -5,10 +5,12 @@ Note	####	Storing MySQL user name or pas
 [connection master]
 include/rpl_restart_server.inc [server_number=2 parameters: --report-port=9000]
 include/start_slave.inc
+include/wait_for_slave_param.inc [Slave_IO_State]
 [Slave restarted with the report-port set to some value]
 include/assert.inc [The value shown for the slave's port number is user specified port number which is the value set for report-port.]
 include/rpl_restart_server.inc [server_number=2]
 include/start_slave.inc
+include/wait_for_slave_param.inc [Slave_IO_State]
 [Slave restarted with the report-port set to the value of slave's port number]
 include/assert.inc [The default value shown for the slave's port number is the actual port number of the slave.]
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_report_port.test'
--- a/mysql-test/suite/rpl/t/rpl_report_port.test	revid:mattias.jonsson@stripped
+++ b/mysql-test/suite/rpl/t/rpl_report_port.test	revid:manish.4.kumar@stripped
@@ -32,6 +32,9 @@ connection master;
 
 connection slave;
 --source include/start_slave.inc
+--let $slave_param= Slave_IO_State
+--let $slave_param_value= Waiting for master to send event
+--source include/wait_for_slave_param.inc
 
 --echo [Slave restarted with the report-port set to some value]
 connection master;
@@ -52,6 +55,9 @@ connection master;
 
 connection slave;
 --source include/start_slave.inc
+--let $slave_param= Slave_IO_State
+--let $slave_param_value= Waiting for master to send event
+--source include/wait_for_slave_param.inc
 
 connection master;
 sync_slave_with_master;

No bundle (reason: useless for push emails).