A fix for Bug#29049 lock_multi fails in rare case.

The patch changes the test case only.
The fix is to replace all 'sleep's with wait_condition. This makes
the test deterministic and also ~300 times faster.


mysql-test/r/lock_multi.result:
  Update result.
mysql-test/t/lock_multi.test:
  A fix for Bug#29049 lock_multi fails in rare case.
  Replace all 'sleep's with wait_condition. This makes
  the test deterministic and also ~300 times faster.

1 files changed, 5 insertions, 3 deletions

diff --git a/mysql-test/r/lock_multi.result b/mysql-test/r/lock_multi.result
index a3f7ab4505c..e89fbec0aed 100644
--- a/mysql-test/r/lock_multi.result
+++ b/mysql-test/r/lock_multi.result
@@ -13,9 +13,9 @@ insert into t1 values (1);
 lock tables t1 read;
 update low_priority t1 set n = 4;
 select n from t1;
-unlock tables;
 n
 1
+unlock tables;
 drop table t1;
 create table t1 (a int, b int);
 create table t2 (c int, d int);
@@ -43,6 +43,7 @@ insert t1 select * from t2;
 drop table t2;
 ERROR 42S02: Table 'test.t2' doesn't exist
 drop table t1;
+End of 4.1 tests
 create table t1(a int);
 lock tables t1 write;
 show columns from t1;
@@ -91,10 +92,11 @@ DROP DATABASE mysqltest_1;
 ERROR HY000: Can't drop database 'mysqltest_1'; database doesn't exist
 create table t1 (f1 int(12) unsigned not null auto_increment, primary key(f1)) engine=innodb;
 lock tables t1 write;
-alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; //
-alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; //
+alter table t1 auto_increment=0;
+alter table t1 auto_increment=0;
 unlock tables;
 drop table t1;
+End of 5.0 tests
 create table t1 (i int);
 lock table t1 read;
 update t1 set i= 10;;