bk commit into 5.0 tree (kroki:1.2118)

[kroki]

Below is the list of changes that have just been committed into a local
5.0 repository of tomash. When tomash does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2118 06/05/06 09:41:24 kroki@stripped +1 -0
  Fix race condition of concurrent RENAME and SHOW TABLES which caused
  random test failures.

  mysql-test/t/rename.test
    1.12 06/05/06 09:41:07 kroki@stripped +7 -1
    Fix race condition and add cleanup code.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kroki
# Host:	moonlight.intranet
# Root:	/home/tomash/src/mysql_ab/mysql-5.0-bug6951

--- 1.11/mysql-test/t/rename.test	2005-07-28 04:21:46 +04:00
+++ 1.12/mysql-test/t/rename.test	2006-05-06 09:41:07 +04:00
@@ -61,9 +61,15 @@
 sleep 1;
 show tables;
 UNLOCK TABLES;
-sleep 1;
+connection con1;
+reap;
+connection con2;
 show tables;
 
 drop table t2, t4;
+
+disconnect con2;
+disconnect con1;
+connection default;
 
 # End of 4.1 tests