diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-03 14:49:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-03 14:49:17 +0200 |
| commit | 533a13af069d8c9e6c5f4e1a72851497185ade03 (patch) | |
| tree | 4623752e0c114e582fbbc0afcc02b67dede26b50 /mysql-test/main/kill.test | |
| parent | 4b3690b50433a169d9feed5dc45044a8934b5582 (diff) | |
| parent | e6290a8270daf884f551230307225b358939bfab (diff) | |
| download | mariadb-git-533a13af069d8c9e6c5f4e1a72851497185ade03.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main/kill.test')
| -rw-r--r-- | mysql-test/main/kill.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/main/kill.test b/mysql-test/main/kill.test index 45d672aebc1..c5bbd349574 100644 --- a/mysql-test/main/kill.test +++ b/mysql-test/main/kill.test @@ -607,6 +607,7 @@ let $wait_condition= SELECT @id:=QUERY_ID FROM INFORMATION_SCHEMA.PROCESSLIST WH source include/wait_condition.inc; KILL QUERY ID @id; connection default; +--error ER_QUERY_INTERRUPTED reap; --error ER_NO_SUCH_QUERY @@ -633,6 +634,7 @@ connection con1; KILL QUERY ID @id; connection default; +--error ER_QUERY_INTERRUPTED reap; disconnect con5; DROP USER u1@localhost; |