bk commit into 5.1 tree (kostja:1.2567)

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja.  When kostja 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, 2008-04-19 22:04:16+04:00, kostja@bodhi.(none) +1 -0
  Fix a race condition in innodb_mysql.test

  mysql-test/include/mix1.inc@stripped, 2008-04-19 22:04:13+04:00, kostja@bodhi.(none) +1 -0
    Fix a race condition in the test, causing a sporadic failure.

diff -Nrup a/mysql-test/include/mix1.inc b/mysql-test/include/mix1.inc
--- a/mysql-test/include/mix1.inc	2008-03-12 11:13:18 +03:00
+++ b/mysql-test/include/mix1.inc	2008-04-19 22:04:13 +04:00
@@ -1309,6 +1309,7 @@ SELECT * FROM t1;
 
 --echo # Switch to connection con2
 connection con2;
+--reap
 SELECT * FROM t1;
 
 --echo # Switch to connection con1