diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-11-27 12:34:13 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-11-27 12:34:13 +0100 |
| commit | 0497ecc2c8a3ff362fdb2e69c558063c23d2e885 (patch) | |
| tree | f49462e90a545f4937afa7ac07aaec8e3864c8e9 | |
| parent | 0f8450b2fb0f3f21a1829254b19bd61c46d09ead (diff) | |
| download | mariadb-git-0497ecc2c8a3ff362fdb2e69c558063c23d2e885.tar.gz | |
fix regression in sp_notembedded after MDEV-3885
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 087c7903dc7..acd4873b212 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -6717,7 +6717,7 @@ 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)) + if ((!thd->killed) || (thd->thread_id == id && thd->killed >= KILL_CONNECTION)) my_ok(thd); } else |