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

[Manish Kumar]

 3783 Manish Kumar	2012-04-10
      BUG#13812374 - RPL.RPL_REPORT_PORT FAILS OCCASIONALLY ON PB2
      
      Problem - this failure occured in the test added for the fix of the 
                bug-13333431. The basic problem of the failure was the 
                value of the report_port which persisted even after the end 
                of the test (ie. rpl_end.inc). So this causes the assertion 
                in the test to fail if it is executed again.
      
      Fix - restarted the server with the default value being passed to the 
            report_port after testing the two expected case so that in the 
            next run of the test we will not encounter the previous value of
            report_port.
     @ mysql-test/suite/rpl/r/rpl_report_port.result
        Updated the corresponding result file.
     @ mysql-test/suite/rpl/t/rpl_report_port-slave.opt
        Removed the slave option file.
     @ mysql-test/suite/rpl/t/rpl_report_port.test
        Added the restart server option before ending the test.

    removed:
      mysql-test/suite/rpl/t/rpl_report_port-slave.opt
    modified:
      mysql-test/suite/rpl/r/rpl_report_port.result
      mysql-test/suite/rpl/t/rpl_report_port.test
 3782 Venkata Sidagam	2012-04-09 [merge]
      Merged from 5.1 to 5.5

    modified:
      client/mysqlslap.c
      mysql-test/r/mysqlslap.result
      mysql-test/t/mysqlslap.test
=== modified file 'mysql-test/suite/rpl/r/rpl_report_port.result'
--- a/mysql-test/suite/rpl/r/rpl_report_port.result	2012-03-09 02:37:16 +0000
+++ b/mysql-test/suite/rpl/r/rpl_report_port.result	2012-04-10 06:14:17 +0000
@@ -1,8 +1,11 @@
 include/master-slave.inc
 [connection master]
-include/assert.inc [The default value shown for the slave's port number is the actual port number of the slave.]
 include/rpl_restart_server.inc [server_number=2 parameters: --report-port=9000]
 include/start_slave.inc
 [Slave restarted with the report-port set to some value]
 include/assert.inc [The value shown for the slave's port number is 9000 which is the value set for report-port.]
+include/rpl_restart_server.inc [server_number=2 parameters: --report-port=]
+include/start_slave.inc
+[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

=== removed file 'mysql-test/suite/rpl/t/rpl_report_port-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_report_port-slave.opt	2012-02-28 08:32:27 +0000
+++ b/mysql-test/suite/rpl/t/rpl_report_port-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---report-port=

=== modified file 'mysql-test/suite/rpl/t/rpl_report_port.test'
--- a/mysql-test/suite/rpl/t/rpl_report_port.test	2012-03-09 02:37:16 +0000
+++ b/mysql-test/suite/rpl/t/rpl_report_port.test	2012-04-10 06:14:17 +0000
@@ -10,22 +10,18 @@
 #
 #====Method====
 #
-# Start replication with report port not set.This will give the actual port 
-# number of the slave (ie. SLAVE_PORT) for the on doing SHOW SLAVE HOSTS on 
-# the master.
-# Restart the slave server with report port set to 9000 and start the slave.
+# Start replication  with report port set to 9000 and restart the slave.
 # In this case on doing SHOW SLAVE HOSTS on the master, we get the port number
 # of the slave to be 9000.
+# In the second case restart the slave server with report port not set. In this
+# case on doing SHOW SLAVE HOSTS on the master, we get the actual port number
+# of the slave (ie. SLAVE_PORT).
 
 source include/master-slave.inc;
+source include/have_binlog_format_mixed.inc;
 
 connection master;
 
---let $report_port= query_get_value(SHOW SLAVE HOSTS, Port, 1)
---let assert_text= The default value shown for the slave's port number is the actual port number of the slave.
---let assert_cond= $report_port = "$SLAVE_MYPORT"
---source include/assert.inc
-
 # Start the server with some value being passed to the report_port= <option>
 # this will be used incase we have to mask the value of the slave's port
 # number in certain situations.
@@ -46,4 +42,25 @@ connection master;
 --let assert_cond= $report_port = "9000"
 --source include/assert.inc
 
+
+# Start the server with the report-port being passed with no value. So on SHOW SLAVE HOSTS
+# on the master the value of slave's port should be the actual value of the slave port.
+
+--let $rpl_server_number= 2
+--let $rpl_server_parameters= --report-port=
+--source include/rpl_restart_server.inc
+
+connection slave;
+--source include/start_slave.inc
+
+--echo [Slave restarted with the report-port set to the value of slave's port number]
+
+connection master;
+
+# The value reported is the actual value of the slave's port.
+--let $report_port= query_get_value(SHOW SLAVE HOSTS, Port, 1)
+--let assert_text= The default value shown for the slave's port number is the actual port number of the slave.
+--let assert_cond= $report_port = "$SLAVE_MYPORT"
+--source include/assert.inc
+
 --source include/rpl_end.inc

No bundle (reason: useless for push emails).