bzr push into mysql-5.5 branch (manish.4.kumar:4090 to 4091) Bug#13812374

[Manish Kumar]

 4091 Manish Kumar	2012-12-04
      BUG#13812374 - RPL.RPL_REPORT_PORT FAILS OCCASIONALLY ON PB2
      
      Problem: The problem with the test is that the slave returns 
               from start_slave.inc call too early before the list
               is actually actualised. This caused the slave stale 
               data to be reported.
      
      Fix: Added a wait in the test till the slave's IO status is 
           changed to "Waiting for master to send event" which 
           which ensures the list is correctly updated.

    modified:
      mysql-test/suite/rpl/r/rpl_report_port.result
      mysql-test/suite/rpl/t/rpl_report_port.test
 4090 Yasufumi Kinoshita	2012-12-04
      UNIV_DEBUG build of some environments needs
      #include "read0read.h"
      for srv0srv.c and trx0rec.c.
      This is only for mysql-5.5

    modified:
      storage/innobase/srv/srv0srv.c
      storage/innobase/trx/trx0rec.c
=== modified file 'mysql-test/suite/rpl/r/rpl_report_port.result'
--- a/mysql-test/suite/rpl/r/rpl_report_port.result	revid:yasufumi.kinoshita@stripped
+++ b/mysql-test/suite/rpl/r/rpl_report_port.result	revid:manish.4.kumar@stripped
@@ -2,10 +2,12 @@ include/master-slave.inc
 [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:yasufumi.kinoshita@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).