Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/rename.test:
  Manual mereg

1 files changed, 8 insertions, 3 deletions

diff --git a/mysql-test/t/rename.test b/mysql-test/t/rename.test
index 054b1bd3403..5c750711853 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,12 +58,17 @@ FLUSH TABLES WITH READ LOCK;
 connection con1;
 send RENAME TABLE t1 TO t2, t3 to t4;
 connection con2;
-sleep 1;
 show tables;
 UNLOCK TABLES;
 connection con1;
 reap;
 connection con2;
+
+# 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;