Merge damien-katzs-computer.local:/Users/dkatz/mysql51

into  damien-katzs-computer.local:/Users/dkatz/51

mysql-test/t/status.test

@@ -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;