From 865548fc8d0574e6418b66def39b6d36bbc0205a Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Fri, 18 Dec 2015 09:50:39 +0100
Subject: MDEV-9088 Server crashes on shutdown after the second post of
 feedback report

On shutdown feedback was sending a short report without creating
a THD. At that point current_thd was pointing to the already
destroyed THD from the previous full report.

backport from 10.1:
  commit bfe703a
  Author: Sergei Golubchik <serg@mariadb.org>
  Date:   Tue Feb 3 18:19:56 2015 +0100

      don't let current_thd to point to a destroyed THD
---
 sql/events.cc | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'sql/events.cc')

diff --git a/sql/events.cc b/sql/events.cc
index 32d194e3bac..75780cd94c5 100644
--- a/sql/events.cc
+++ b/sql/events.cc
@@ -907,10 +907,7 @@ end:
   if (res)
     deinit();
   if (!had_thd)
-  {
     delete thd;
-    set_current_thd(0);
-  }
 
   DBUG_RETURN(res);
 }
-- 
cgit v1.2.1