diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 14:39:18 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 14:39:18 +0200 |
| commit | 1dc2f35598193fc52b79061c286b61f01c617374 (patch) | |
| tree | 30e3972564ec174de0432e429f5f0897bf0b41a7 /mysql-test/main/kill.test | |
| parent | da5d3499353036d39c3a4bcd1f0466f7de3fc263 (diff) | |
| parent | fdf43b5c78c4aeb26efdbef3172746e007ab6f1d (diff) | |
| download | mariadb-git-1dc2f35598193fc52b79061c286b61f01c617374.tar.gz | |
Merge 10.4 into 10.5
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 4a421babf66..d13dd270f78 100644 --- a/mysql-test/main/kill.test +++ b/mysql-test/main/kill.test @@ -256,7 +256,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; @@ -274,7 +274,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`; |