mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +01:00
Merge magare.gmz:/home/kgeorge/mysql/work/B25228-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B25228-5.1-opt mysql-test/suite/rpl/t/rpl_relayspace.test: Auto merged
This commit is contained in:
commit
d6bef8a5c5
1 changed files with 16 additions and 0 deletions
|
@ -14,6 +14,22 @@ 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;
|
||||
# A bug caused the I/O thread to refuse stopping.
|
||||
stop slave io_thread;
|
||||
|
|
Loading…
Add table
Reference in a new issue