Commit c1551bf9 authored by knielsen@mysql.com's avatar knielsen@mysql.com
Browse files

BUG#15624: Use --real_sleep in rpl_deadlock.test to avoid breaking when run with --sleep.

parent 7fe1a403

mysql-test/t/rpl_deadlock.test

+3 −3
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ while ($1) 
enable_query_log;

select * from t1 for update;

start slave;

--sleep 3 # hope that slave is blocked now

--real_sleep 3 # hope that slave is blocked now

insert into t2 values(22); # provoke deadlock, slave should be victim

commit;

sync_with_master;
@@ -76,7 +76,7 @@ change master to master_log_pos=532; # the BEGIN log event 
begin;

select * from t2 for update; # hold lock

start slave;

--sleep 10 # slave should have blocked, and be retrying

--real_sleep 10 # slave should have blocked, and be retrying

commit;

sync_with_master;

select * from t1; # check that slave succeeded finally
@@ -97,7 +97,7 @@ change master to master_log_pos=532; 
begin;

select * from t2 for update;

start slave;

--sleep 10

--real_sleep 10

commit;

sync_with_master;

select * from t1;