summaryrefslogtreecommitdiff
path: root/mysql-test/suite
diff options
context:
space:
mode:
authorManish Kumar <manish.4.kumar@oracle.com>2012-12-04 18:14:01 +0530
committerManish Kumar <manish.4.kumar@oracle.com>2012-12-04 18:14:01 +0530
commit14b18b27854dcbbb732a3c23af64cb9eddff0ea7 (patch)
tree749b4ecee539c5ccd39845cab511aa71a3d45253 /mysql-test/suite
parent859ff1ec36cac3fae7862b738a4d58f50ca7d44a (diff)
downloadmariadb-git-14b18b27854dcbbb732a3c23af64cb9eddff0ea7.tar.gz
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.
Diffstat (limited to 'mysql-test/suite')
-rw-r--r--mysql-test/suite/rpl/r/rpl_report_port.result2
-rw-r--r--mysql-test/suite/rpl/t/rpl_report_port.test6
2 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_report_port.result b/mysql-test/suite/rpl/r/rpl_report_port.result
index 6a9ac341780..2f422c8b577 100644
--- a/mysql-test/suite/rpl/r/rpl_report_port.result
+++ b/mysql-test/suite/rpl/r/rpl_report_port.result
@@ -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
diff --git a/mysql-test/suite/rpl/t/rpl_report_port.test b/mysql-test/suite/rpl/t/rpl_report_port.test
index 12c34ce01b1..6e728a678ad 100644
--- a/mysql-test/suite/rpl/t/rpl_report_port.test
+++ b/mysql-test/suite/rpl/t/rpl_report_port.test
@@ -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;