#At file:///home/ksm/sun/repo/bug25228/mysql-5.1-bugteam/ based on revid:timothy.smith@stripped
2748 Serge Kozlov 2009-01-19
Bug#25228:
1. Added waiting proper state of slave for start/stop commands
2. Name of binlog file imported from SHOW MASTER STATUS.
3. Updated result file.
modified:
mysql-test/suite/rpl/r/rpl_relayspace.result
mysql-test/suite/rpl/t/rpl_relayspace.test
=== modified file 'mysql-test/suite/rpl/r/rpl_relayspace.result'
--- a/mysql-test/suite/rpl/r/rpl_relayspace.result 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/r/rpl_relayspace.result 2009-01-19 15:12:48 +0000
@@ -14,6 +14,6 @@ start slave io_thread;
stop slave io_thread;
reset slave;
start slave;
-select master_pos_wait('master-bin.001',200,6)=-1;
-master_pos_wait('master-bin.001',200,6)=-1
+select master_pos_wait('master-bin.000001',200,6)=-1;
+master_pos_wait('master-bin.000001',200,6)=-1
0
=== modified file 'mysql-test/suite/rpl/t/rpl_relayspace.test'
--- a/mysql-test/suite/rpl/t/rpl_relayspace.test 2008-02-28 11:36:14 +0000
+++ b/mysql-test/suite/rpl/t/rpl_relayspace.test 2009-01-19 15:12:48 +0000
@@ -2,8 +2,10 @@
# to force the deadlock after one event.
source include/master-slave.inc;
+let $master_log_file= query_get_value(SHOW MASTER STATUS, File, 1);
connection slave;
stop slave;
+source include/wait_for_slave_to_stop.inc;
connection master;
# This will generate a master's binlog > 10 bytes
create table t1 (a int);
@@ -20,6 +22,7 @@ source include/wait_for_slave_param.inc;
# A bug caused the I/O thread to refuse stopping.
stop slave io_thread;
+source include/wait_for_slave_io_to_stop.inc;
reset slave;
start slave;
# The I/O thread stops filling the relay log when
@@ -32,6 +35,6 @@ start slave;
# it will timeout after 10 seconds;
# also the slave will probably not cooperate to shutdown
# (as 2 threads are locked)
-select master_pos_wait('master-bin.001',200,6)=-1;
+eval select master_pos_wait('$master_log_file',200,6)=-1;
# End of 4.1 tests
