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

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

mysql-test/t/status.test

@@ -25,7 +25,7 @@ connection con1;
 --send
 update t1 set n = 3;
 connection con2;
-sleep 0.5;
+sleep 1;
 unlock tables;
 connection con1;
 reap;