bk commit into 4.1 tree (kroki:1.2540)

[kroki]

Below is the list of changes that have just been committed into a local
4.1 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@stripped, 2006-11-03 12:16:31+03:00, kroki@stripped +2 -0
  Cleanup: fix race in rename.test.

  mysql-test/r/rename.result@stripped, 2006-11-03 12:16:29+03:00, kroki@stripped +1 -0
    Update result.

  mysql-test/t/rename.test@stripped, 2006-11-03 12:16:29+03:00, kroki@stripped +8 -2
    Remove the race by replacing sleep with a reap.

# 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-4.1-cleanup

--- 1.9/mysql-test/r/rename.result	2006-11-03 12:16:35 +03:00
+++ 1.10/mysql-test/r/rename.result	2006-11-03 12:16:35 +03:00
@@ -54,3 +54,4 @@ Tables_in_test
 t2
 t4
 drop table t2, t4;
+End of 4.1 tests

--- 1.11/mysql-test/t/rename.test	2006-11-03 12:16:35 +03:00
+++ 1.12/mysql-test/t/rename.test	2006-11-03 12:16:35 +03:00
@@ -61,9 +61,15 @@ connection con2;
 sleep 1;
 show tables;
 UNLOCK TABLES;
-sleep 1;
+connection con1;
+reap;
+connection con2;
 show tables;
 
 drop table t2, t4;
 
-# End of 4.1 tests
+disconnect con2;
+disconnect con1;
+connection default;
+
+--echo End of 4.1 tests