From 0497ecc2c8a3ff362fdb2e69c558063c23d2e885 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Tue, 27 Nov 2012 12:34:13 +0100 Subject: [PATCH] fix regression in sp_notembedded after MDEV-3885 --- sql/sql_parse.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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