fix more sporadic failures on main.kill

sometimes `KILL QUERY ID @id` was executed before the previous
`send SELECT SLEEP(1000)` has reached the parser. As the statement
resets the kill status before execution, the effect of the KILL
was ignored.

Author: vuvova

mysql-test/main/kill.test

@@ -542,7 +542,7 @@ connection default;
 --echo #
 send SELECT SLEEP(1000);
 connection con1;
-let $wait_condition= SELECT @id:=QUERY_ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO='SELECT SLEEP(1000)';
+let $wait_condition= SELECT @id:=QUERY_ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO='SELECT SLEEP(1000)' AND STATE='User sleep';
 source include/wait_condition.inc;
 KILL QUERY ID @id;
 connection default;
@@ -560,7 +560,7 @@ CREATE USER u1@localhost;
 send SELECT SLEEP(1000);
 
 connection con1;
-let $wait_condition= SELECT @id:=QUERY_ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO='SELECT SLEEP(1000)';
+let $wait_condition= SELECT @id:=QUERY_ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO='SELECT SLEEP(1000)' AND STATE='User sleep';
 source include/wait_condition.inc;
 let $id= `SELECT @id`;