bk commit into 5.1 tree (dkatz:1.2516) BUG#29307

[damien]

Below is the list of changes that have just been committed into a local
5.1 repository of dkatz. When dkatz 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, 2007-06-26 21:10:51-04:00, dkatz@stripped +1 -0
  Bug #29307  	status.test fails with different Table_locks_immediate
  
  Instead of sleeping for a fixed period of time, we wait until the other query is executing.

  mysql-test/t/status.test@stripped, 2007-06-26 21:10:46-04:00, dkatz@stripped +4 -1
    Bug #29307  	status.test fails with different Table_locks_immediate
    
    Instead of sleeping for a fixed period of time, we wait until the other query is executing.

diff -Nrup a/mysql-test/t/status.test b/mysql-test/t/status.test
--- a/mysql-test/t/status.test	2006-12-26 10:56:17 -05:00
+++ b/mysql-test/t/status.test	2007-06-26 21:10:46 -04:00
@@ -22,11 +22,14 @@ connection con2;
 lock tables t1 read;
 unlock tables;
 lock tables t1 read;
+let $ID= `select connection_id()`;
 connection con1;
 --send
 update t1 set n = 3;
 connection con2;
-sleep 0.5;
+# wait for the other query to start executing
+let $wait_condition= select 1 from INFORMATION_SCHEMA.PROCESSLIST where ID = $ID and STATE = 0;
+--source include/wait_condition.inc
 unlock tables;
 connection con1;
 reap;