Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint

into  mysql.com:/usr/home/ram/work/bug23412/my41-bug23412

mysql-test/include/wait_for_query_to_suceed.inc

+#
+# Run a query over and over until it suceeds ot timeout occurs
+#
+
+
+let $counter= 100;
+
+disable_abort_on_error;
+disable_query_log;
+disable_result_log;
+eval $query;
+while ($mysql_errno)
+{
+  eval $query;
+  sleep 0.1;
+  dec $counter;
+
+  if (!$counter)
+  {
+    die("Waited too long for query to suceed");
+  }
+}
+enable_abort_on_error;
+enable_query_log;
+enable_result_log;

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;