diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-09-12 08:41:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-09-12 08:41:35 +0200 |
| commit | 269f0a6871e68162c9dd3308b078ab7e48d73d44 (patch) | |
| tree | 53ccefa0d5b31b05e9146269037c820b0fb53b75 /mysql-test | |
| parent | 3d9452363848a5de70260f5b72900fb016075b3c (diff) | |
| download | mariadb-git-269f0a6871e68162c9dd3308b078ab7e48d73d44.tar.gz | |
MDEV-6619 SHOW PROCESSLIST returns empty result set after KILL QUERY
don't send an OK packet if the SHOW PROCESSLIST was killed
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/kill_processlist-6619.result | 14 | ||||
| -rw-r--r-- | mysql-test/t/kill_processlist-6619.test | 17 |
2 files changed, 31 insertions, 0 deletions
diff --git a/mysql-test/r/kill_processlist-6619.result b/mysql-test/r/kill_processlist-6619.result new file mode 100644 index 00000000000..588c8e6d139 --- /dev/null +++ b/mysql-test/r/kill_processlist-6619.result @@ -0,0 +1,14 @@ +connect con1,localhost,root,,; +SHOW PROCESSLIST; +Id User Host db Command Time State Info Progress +# root # test Sleep # # NULL 0.000 +# root # test Query # # SHOW PROCESSLIST 0.000 +connection default; +KILL QUERY con_id; +connection con1; +SHOW PROCESSLIST; +ERROR 70100: Query execution was interrupted +SHOW PROCESSLIST; +Id User Host db Command Time State Info Progress +# root # test Sleep # # NULL 0.000 +# root # test Query # # SHOW PROCESSLIST 0.000 diff --git a/mysql-test/t/kill_processlist-6619.test b/mysql-test/t/kill_processlist-6619.test new file mode 100644 index 00000000000..2333f02eac6 --- /dev/null +++ b/mysql-test/t/kill_processlist-6619.test @@ -0,0 +1,17 @@ +# +# MDEV-6619 SHOW PROCESSLIST returns empty result set after KILL QUERY +# +--source include/not_embedded.inc +--enable_connect_log +--connect (con1,localhost,root,,) +--let $con_id = `SELECT CONNECTION_ID()` +--replace_column 1 # 3 # 6 # 7 # +SHOW PROCESSLIST; +--connection default +--replace_result $con_id con_id +eval KILL QUERY $con_id; +--connection con1 +--error ER_QUERY_INTERRUPTED +SHOW PROCESSLIST; +--replace_column 1 # 3 # 6 # 7 # +SHOW PROCESSLIST; |