fix regression in sp_notembedded after MDEV-3885

0497ecc2 · Vladislav Vaintroub · 0f8450b2 · 0497ecc2
Commit 0497ecc2 authored Nov 27, 2012 by Vladislav Vaintroub
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_parse.cc sql/sql_parse.cc +1 -1

No files found.
--- 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