summaryrefslogtreecommitdiff
path: root/sql/sql_reload.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-12-18 09:50:39 +0100
committerSergei Golubchik <serg@mariadb.org>2015-12-19 13:36:21 +0100
commit865548fc8d0574e6418b66def39b6d36bbc0205a (patch)
tree21489f525ada1e65b4d4fa51bd6c9d9925d9a317 /sql/sql_reload.cc
parent3b9423fda2612a463e9f3af5750234ccf2667545 (diff)
downloadmariadb-git-865548fc8d0574e6418b66def39b6d36bbc0205a.tar.gz
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
Diffstat (limited to 'sql/sql_reload.cc')
-rw-r--r--sql/sql_reload.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc
index 4d22dae1c47..86d1e27a4ef 100644
--- a/sql/sql_reload.cc
+++ b/sql/sql_reload.cc
@@ -98,8 +98,6 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options,
if (tmp_thd)
{
delete tmp_thd;
- /* Remember that we don't have a THD */
- set_current_thd(0);
thd= 0;
}
reset_mqh((LEX_USER *)NULL, TRUE);