Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0

into zim.(none):/home/brian/mysql/mysql-5.0

mysql-test/t/kill.test

@@ -44,7 +44,7 @@ select get_lock("a", 10);
 connection con2;
 let $ID= `select connection_id()`;
 send select get_lock("a", 10);
--- sleep 2
+--real_sleep 2;
 connection con1;
 disable_query_log;
 eval kill query $ID;