From 865548fc8d0574e6418b66def39b6d36bbc0205a Mon Sep 17 00:00:00 2001 From: Sergei Golubchik 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 Date: Tue Feb 3 18:19:56 2015 +0100 don't let current_thd to point to a destroyed THD --- sql/sql_class.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/sql_class.cc') diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 583abee360f..7a9cdad84f6 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1645,7 +1645,7 @@ THD::~THD() DBUG_ASSERT(status_var.memory_used == 0); // Ensure everything is freed } - set_current_thd(orig_thd); + set_current_thd(orig_thd == this ? 0 : orig_thd); DBUG_VOID_RETURN; } -- cgit v1.2.1