summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-07-17 22:59:14 +0300
committerunknown <monty@hundin.mysql.fi>2001-07-17 22:59:14 +0300
commit964e4095874d9fc6bce8c64ff484cbe7deebf125 (patch)
treeadae23d022832ac2bee0a653c88137f823db19d6
parent703f4d7b0298834a830aadb2874d6a082e444f99 (diff)
downloadmariadb-git-964e4095874d9fc6bce8c64ff484cbe7deebf125.tar.gz
Added timeouts to make lock test repeatable
mysql-test/r/lock.result: Fixed wrong result for lock mysql-test/t/lock.test: Added timeouts to make test repeatable
-rw-r--r--mysql-test/r/lock.result2
-rw-r--r--mysql-test/t/lock.test4
2 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/r/lock.result b/mysql-test/r/lock.result
index 24a40321f13..ccd3c02558d 100644
--- a/mysql-test/r/lock.result
+++ b/mysql-test/r/lock.result
@@ -5,6 +5,6 @@ test.t1 check status OK
Table Op Msg_type Msg_text
test.t2 check error Table 't2' was not locked with LOCK TABLES
n
-1
+4
n
1
diff --git a/mysql-test/t/lock.test b/mysql-test/t/lock.test
index 1eed6bb91e9..77354e63252 100644
--- a/mysql-test/t/lock.test
+++ b/mysql-test/t/lock.test
@@ -66,8 +66,10 @@ lock tables t1 write;
connection writer;
send update low_priority t1 set n = 4;
connection reader;
+--sleep 2
send select n from t1;
connection locker;
+--sleep 2
unlock tables;
connection writer;
reap;
@@ -82,8 +84,10 @@ lock tables t1 read;
connection writer;
send update low_priority t1 set n = 4;
connection reader;
+--sleep 2
send select n from t1;
connection locker;
+--sleep 2
unlock tables;
connection writer;
reap;