diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-11-30 22:49:44 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-12-02 16:19:13 +0100 |
| commit | 1547e55489813ff7dc3d75a1d7feb0d532f02acf (patch) | |
| tree | d0cbf87f288c3c826774869168978466c19a3192 | |
| parent | 401ae95a6089b0cec5e5b9900bdb44a1f78c4248 (diff) | |
| download | mariadb-git-1547e55489813ff7dc3d75a1d7feb0d532f02acf.tar.gz | |
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.
| -rw-r--r-- | mysql-test/main/kill.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/kill.test b/mysql-test/main/kill.test index f7fe0f38272..b197865f5ed 100644 --- a/mysql-test/main/kill.test +++ b/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`; |