diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 11:37:33 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 11:37:33 +0200 |
commit | fdf43b5c78c4aeb26efdbef3172746e007ab6f1d (patch) | |
tree | 7497fd0a024da01b2ade9c45e484a9d004a3f13b /mysql-test/main/kill.test | |
parent | 382e85fe70cfffb6c7190c627647c19aed3912a5 (diff) | |
parent | 8f30973234de520d95dfccca8409e5802b845331 (diff) | |
download | mariadb-git-fdf43b5c78c4aeb26efdbef3172746e007ab6f1d.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main/kill.test')
-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 ccc2a93b0a4..232df004395 100644 --- a/mysql-test/main/kill.test +++ b/mysql-test/main/kill.test @@ -541,7 +541,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; @@ -559,7 +559,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`; |