diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-02-03 18:19:56 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-03 18:19:56 +0100 |
| commit | bfe703a45888107936c184076eaead28b8b8a90a (patch) | |
| tree | 183080fb1f6665badce232171ec4423927bbaec8 /sql/tztime.cc | |
| parent | d0fb9580e0b2400d633b672e881a9d661cafb07f (diff) | |
| download | mariadb-git-bfe703a45888107936c184076eaead28b8b8a90a.tar.gz | |
don't let current_thd to point to a destroyed THD
* reset current_thd in THD::~THD, otherwise my_malloc_size_cb_func()
might access THD after it was destroyed.
* remove now redundant set_current_thd(0) calls that follow delete 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 24e61588a06..1cb1f5a0d5c 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; |