summaryrefslogtreecommitdiff
path: root/mysql-test/suite/rpl/t/rpl_relayspace.test
diff options
context:
space:
mode:
authorunknown <skozlov/ksm@mysql.com/virtop.(none)>2008-02-28 14:36:14 +0300
committerunknown <skozlov/ksm@mysql.com/virtop.(none)>2008-02-28 14:36:14 +0300
commit5c78f82915e916d9da0839604a7b608a5846f531 (patch)
tree38b29ece9f369d3bdfcbb7a28427935e0d69b014 /mysql-test/suite/rpl/t/rpl_relayspace.test
parent51a99d70e92ca9fd1e8e9889a531ab86846d4062 (diff)
downloadmariadb-git-5c78f82915e916d9da0839604a7b608a5846f531.tar.gz
WL#4091, replace sleeps
mysql-test/suite/rpl/r/rpl_flushlog_loop.result: updated result mysql-test/suite/rpl/r/rpl_row_view01.result: updated result mysql-test/suite/rpl/t/rpl_change_master.test: replace sleep mysql-test/suite/rpl/t/rpl_drop_temp.test: replace sleep mysql-test/suite/rpl/t/rpl_flushlog_loop.test: replace sleep mysql-test/suite/rpl/t/rpl_relayspace.test: replace waiting of state to wait_for_slave_param.inc mysql-test/suite/rpl/t/rpl_row_view01.test: replace sleep mysql-test/suite/rpl/t/rpl_trunc_temp.test: replace sleep mysql-test/include/wait_for_binlog_event.inc: New primitive: waiting an event in binlog on master
Diffstat (limited to 'mysql-test/suite/rpl/t/rpl_relayspace.test')
-rw-r--r--mysql-test/suite/rpl/t/rpl_relayspace.test21
1 files changed, 4 insertions, 17 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_relayspace.test b/mysql-test/suite/rpl/t/rpl_relayspace.test
index d4ef2fe59bd..0fc564cdb46 100644
--- a/mysql-test/suite/rpl/t/rpl_relayspace.test
+++ b/mysql-test/suite/rpl/t/rpl_relayspace.test
@@ -14,23 +14,10 @@ connection slave;
reset slave;
start slave io_thread;
# Give the I/O thread time to block.
-let $run= 1;
-let $counter= 300;
-while ($run)
-{
- let $io_state= query_get_value("SHOW SLAVE STATUS", Slave_IO_State, 1);
- if (`SELECT '$io_state' = 'Waiting for the slave SQL thread to free enough relay log space'`){
- let $run= 0;
- }
- sleep 0.1;
- if (!$counter){
- --echo "Failed while waiting for slave IO thread block"
- SHOW SLAVE STATUS;
- exit;
- }
- dec $counter;
-}
-sleep 2;
+let $slave_param= Slave_IO_State;
+let $slave_param_value= Waiting for the slave SQL thread to free enough relay log space;
+source include/wait_for_slave_param.inc;
+
# A bug caused the I/O thread to refuse stopping.
stop slave io_thread;
reset slave;