summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorunknown <msvensson@shellback.(none)>2006-10-30 14:42:28 +0100
committerunknown <msvensson@shellback.(none)>2006-10-30 14:42:28 +0100
commitc2b8a63ccf70164962fcee3d03824d60f5071b43 (patch)
tree21a2270211c86f61aea458d64edece94e1c6ff87 /mysql-test/t
parentf9ff7472a23d97cc7235b5396191b02aad37fc21 (diff)
downloadmariadb-git-c2b8a63ccf70164962fcee3d03824d60f5071b43.tar.gz
Bug#18654 Test is timing-dependent and fails from scheduling effects (?)
- Wait in loop with small sleep until tables has been renamed mysql-test/t/rename.test: To avoid scheduling effects wait for the tables to be renamed in a loop with small sleeps before continuing with tests mysql-test/include/wait_for_query_to_suceed.inc: New BitKeeper file ``mysql-test/include/wait_for_query_to_suceed.inc''
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/rename.test12
1 files changed, 8 insertions, 4 deletions
diff --git a/mysql-test/t/rename.test b/mysql-test/t/rename.test
index 5caecef176e..b0fb60c0ee4 100644
--- a/mysql-test/t/rename.test
+++ b/mysql-test/t/rename.test
@@ -43,8 +43,8 @@ select * from t3;
drop table if exists t1,t2,t3,t4;
#
-# Test-case for Bug #2397 RENAME TABLES is not blocked by
-# FLUSH TABLES WITH READ LOCK
+# Bug #2397 RENAME TABLES is not blocked by
+# FLUSH TABLES WITH READ LOCK
#
connect (con1,localhost,root,,);
@@ -58,10 +58,14 @@ FLUSH TABLES WITH READ LOCK;
connection con1;
send RENAME TABLE t1 TO t2, t3 to t4;
connection con2;
-sleep 1;
show tables;
UNLOCK TABLES;
-sleep 1;
+
+# Wait for the the tables to be renamed
+# i.e the query below succeds
+let $query= select * from t2, t4;
+source include/wait_for_query_to_suceed.inc;
+
show tables;
drop table t2, t4;