mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
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.
This commit is contained in:
parent
401ae95a60
commit
1547e55489
1 changed files with 2 additions and 2 deletions
|
@ -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`;
|
||||
|
||||
|
|
Loading…
Reference in a new issue