Commit 63800e09 authored by skozlov/ksm@mysql.com/virtop.localdomain's avatar skozlov/ksm@mysql.com/virtop.localdomain
Browse files

WL#4091, part1. replace --sleep by include/wait_condition.inc

parent 60880ec8

mysql-test/suite/rpl/r/rpl_start_stop_slave.result

+1 −1
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ reset master; 
reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

stop slave;

create table t1(n int);

stop slave;

start slave;

stop slave io_thread;

start slave io_thread;

mysql-test/suite/rpl/t/rpl_critical_errors.test

+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ connection master1; 


# This sleep is picked so that the query above has started to insert

# some rows into t2. If it hasn't the slave will not stop below.

sleep 4;

let $wait_condition= SELECT COUNT(*) > 1000 FROM t1;

source include/wait_condition.inc



# SHOW PROCESSLIST;

mysql-test/suite/rpl/t/rpl_err_ignoredtable.test

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ insert into t3 values(connection_id()); 
send update t2 set a = a + 1 + get_lock('crash_lock%20C', 10);



connection master1;

real_sleep 2;

let $wait_condition= SELECT a > 1 FROM t2;

source include/wait_condition.inc;

select (@id := id) - id from t3;

kill @id;

drop table t2,t3;

mysql-test/suite/rpl/t/rpl_init_slave.test

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ source include/master-slave.inc; 


save_master_pos;

connection slave;

sleep 1;

show variables like 'init_slave';

show variables like 'max_connections';

sync_with_master;

mysql-test/suite/rpl/t/rpl_insert.test

+2 −12
Original line number Diff line number Diff line
@@ -17,18 +17,8 @@ let $query = "INSERT DELAYED INTO t1 VALUES (1, 'Dr. No'), (2, 'From Russia With 
--exec $MYSQL_SLAP --silent --concurrency=5 --iterations=200 --query=$query --delimiter=";"



# Wait until all the 5000 inserts has been inserted into the table

--disable_query_log

let $counter= 300; # Max 30 seconds wait

while (`select count(*)!=5000 from mysqlslap.t1`)

{

  sleep 0.1;

  dec $counter;

  if (!$counter)

  {

    Number of records in t1 didnt reach 5000;

  }

}

--enable_query_log

let $wait_condition= SELECT COUNT(*) = 5000 FROM mysqlslap.t1;

--source include/wait_condition.inc



SELECT COUNT(*) FROM mysqlslap.t1;

sync_slave_with_master;