diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-11-27 15:47:08 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-11-27 15:47:08 +0100 |
| commit | 5fddd4a7f09c7cb7ae2171f284130b1316aa6235 (patch) | |
| tree | 912e987e32170f97cb2205aaf5c665a3ce3897b0 /sql/sql_parse.cc | |
| parent | 0497ecc2c8a3ff362fdb2e69c558063c23d2e885 (diff) | |
| download | mariadb-git-5fddd4a7f09c7cb7ae2171f284130b1316aa6235.tar.gz | |
Fix yet another regression after MDEV-3885.
If connection kills itself (or own query), it will get an error consistently,
with both COM_PROCESSKILL and with "KILL [QUERY] id"
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index acd4873b212..5dac052b749 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -6717,8 +6717,10 @@ void sql_kill(THD *thd, ulong id, killed_state state) uint error; if (!(error= kill_one_thread(thd, id, state))) { - if ((!thd->killed) || (thd->thread_id == id && thd->killed >= KILL_CONNECTION)) + if ((!thd->killed)) my_ok(thd); + else + my_error(killed_errno(thd->killed), MYF(0), id); } else my_error(error, MYF(0), id); |