From 544eeda30d740bf8eaa99e8a1f47fbbbc3ef2086 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Mon, 7 Dec 2015 20:27:58 +0100
Subject: MDEV-8644 Using a UDF in a virtual column causes a crash when
 stopping the server

first close all tables, then unload UDFs
---
 sql/mysqld.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/mysqld.cc')

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();
-- 
cgit v1.2.1