diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-18 09:50:39 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-19 13:36:21 +0100 |
| commit | 865548fc8d0574e6418b66def39b6d36bbc0205a (patch) | |
| tree | 21489f525ada1e65b4d4fa51bd6c9d9925d9a317 /sql/tztime.cc | |
| parent | 3b9423fda2612a463e9f3af5750234ccf2667545 (diff) | |
| download | mariadb-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/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index 6486e9b2018..9791e218108 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -1803,11 +1803,7 @@ end: if (org_thd) org_thd->store_globals(); /* purecov: inspected */ else - { - /* Remember that we don't have a THD */ - set_current_thd(0); my_pthread_setspecific_ptr(THR_MALLOC, 0); - } default_tz= default_tz_name ? global_system_variables.time_zone : my_tz_SYSTEM; |