bk commit into 5.0 tree (knielsen:1.1999) BUG#15624

[knielsen]

Below is the list of changes that have just been committed into a local
5.0 repository of mysqldev. When mysqldev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1999 05/12/13 11:42:10 knielsen@stripped +1 -0
  BUG#15624: Use --real_sleep in rpl_deadlock.test to avoid breaking when run with --sleep.

  mysql-test/t/rpl_deadlock.test
    1.11 05/12/13 11:41:11 knielsen@stripped +3 -3
    BUG#15624: Use --real_sleep to avoid breaking when run with --sleep.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	knielsen
# Host:	production.mysql.com
# Root:	/data0/mysqldev/my/mysql-5.0-release

--- 1.10/mysql-test/t/rpl_deadlock.test	2005-12-05 17:56:20 +01:00
+++ 1.11/mysql-test/t/rpl_deadlock.test	2005-12-13 11:41:11 +01:00
@@ -58,7 +58,7 @@
 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 @@
 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 @@
 begin;
 select * from t2 for update;
 start slave;
---sleep 10
+--real_sleep 10
 commit;
 sync_with_master;
 select * from t1;