bk commit into 5.1 tree (dkatz:1.2566) BUG#29910

[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-07-19 15:25:54-04:00, dkatz@stripped +1 -0
  Bug #29910  	Sporadic test failure in status.test

  mysql-test/t/status.test@stripped, 2007-07-19 15:25:50-04:00, dkatz@stripped +2 -2
    Fixed test to correctly wait for right server process and state.

diff -Nrup a/mysql-test/t/status.test b/mysql-test/t/status.test
--- a/mysql-test/t/status.test	2007-07-10 14:24:02 -04:00
+++ b/mysql-test/t/status.test	2007-07-19 15:25:50 -04:00
@@ -22,13 +22,13 @@ connection con2;
 lock tables t1 read;
 unlock tables;
 lock tables t1 read;
-let $ID= `select connection_id()`;
 connection con1;
+let $ID= `select connection_id()`;
 --send
 update t1 set n = 3;
 connection con2;
 # wait for the other query to start executing
-let $wait_condition= select 1 from INFORMATION_SCHEMA.PROCESSLIST where ID = $ID and STATE = 0;
+let $wait_condition= select 1 from INFORMATION_SCHEMA.PROCESSLIST where ID = $ID and STATE = "Locked";
 --source include/wait_condition.inc
 unlock tables;
 connection con1;