summaryrefslogtreecommitdiff
path: root/sql/sql_servers.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_servers.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_servers.cc')
-rw-r--r--sql/sql_servers.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_servers.cc b/sql/sql_servers.cc
index 7f4d70a6b43..9b944662545 100644
--- a/sql/sql_servers.cc
+++ b/sql/sql_servers.cc
@@ -173,8 +173,6 @@ bool servers_init(bool dont_read_servers_table)
*/
return_val= servers_reload(thd);
delete thd;
- /* Remember that we don't have a THD */
- set_current_thd(0);
end:
DBUG_RETURN(return_val);