summaryrefslogtreecommitdiff
path: root/sql/sql_plugin.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-02-03 18:19:56 +0100
committerSergei Golubchik <serg@mariadb.org>2015-02-03 18:19:56 +0100
commitbfe703a45888107936c184076eaead28b8b8a90a (patch)
tree183080fb1f6665badce232171ec4423927bbaec8 /sql/sql_plugin.cc
parentd0fb9580e0b2400d633b672e881a9d661cafb07f (diff)
downloadmariadb-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/sql_plugin.cc')
-rw-r--r--sql/sql_plugin.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index e9a0f138212..900167c1fab 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -1775,7 +1775,6 @@ static void plugin_load(MEM_ROOT *tmp_root)
end:
/* Remember that we don't have a THD */
delete new_thd;
- set_current_thd(0);
DBUG_VOID_RETURN;
}