summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-12-07 20:27:58 +0100
committerSergei Golubchik <serg@mariadb.org>2015-12-08 09:46:52 +0100
commit544eeda30d740bf8eaa99e8a1f47fbbbc3ef2086 (patch)
tree9c091500d5ba42869176b8c1af31a72c1b847be7 /sql/mysqld.cc
parent79d08e682ff70469abe7146f06b3b4103679e072 (diff)
downloadmariadb-git-544eeda30d740bf8eaa99e8a1f47fbbbc3ef2086.tar.gz
MDEV-8644 Using a UDF in a virtual column causes a crash when stopping the server
first close all tables, then unload UDFs
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 6c72954e9c2..6a14b5c2e7e 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1813,9 +1813,9 @@ void clean_up(bool print_message)
item_user_lock_free();
lex_free(); /* Free some memory */
item_create_cleanup();
- udf_free();
table_def_start_shutdown();
plugin_shutdown();
+ udf_free();
ha_end();
if (tc_log)
tc_log->close();