summaryrefslogtreecommitdiff
path: root/sql/sql_plugin.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-06-01 16:33:41 +0200
committerSergei Golubchik <serg@mariadb.org>2015-06-01 16:33:41 +0200
commit9c41b35b6aa7eba86273f8634dd6d633b140211e (patch)
tree06db4a3be3ee5ce1745cb2969f102fb6287f5edc /sql/sql_plugin.cc
parentd60257454213ac465c94b441fca477524b7dee82 (diff)
downloadmariadb-git-9c41b35b6aa7eba86273f8634dd6d633b140211e.tar.gz
MDEV-8220 Server crashes if started with --enforce-storage-engine option
Diffstat (limited to 'sql/sql_plugin.cc')
-rw-r--r--sql/sql_plugin.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 85e2151d888..847669d84ea 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -3107,6 +3107,9 @@ void plugin_thdvar_init(THD *thd)
if (global_system_variables.tmp_table_plugin)
thd->variables.tmp_table_plugin=
intern_plugin_lock(NULL, global_system_variables.tmp_table_plugin);
+ if (global_system_variables.enforced_table_plugin)
+ thd->variables.enforced_table_plugin=
+ intern_plugin_lock(NULL, global_system_variables.enforced_table_plugin);
intern_plugin_unlock(NULL, old_table_plugin);
intern_plugin_unlock(NULL, old_tmp_table_plugin);
intern_plugin_unlock(NULL, old_enforced_table_plugin);