summaryrefslogtreecommitdiff
path: root/sql/sys_vars.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2014-06-14 22:15:52 +0200
committerSergei Golubchik <serg@mariadb.org>2014-06-15 18:42:31 +0200
commitcf1a09e42f695bcd24dd8a4a928cd1f560c3c00a (patch)
tree1d9c502f2529f0240fb91d88ed4012c9a9989d2e /sql/sys_vars.cc
parent2edcf8f9ff2a1afb1d2bd5028a93b5f07ef0644e (diff)
downloadmariadb-git-cf1a09e42f695bcd24dd8a4a928cd1f560c3c00a.tar.gz
MDEV-6107 merge default_tmp_storage_engine
Adapt default_tmp_storage_engine implementation from mysql-5.6 New feature (as compared to 5.6), default_tmp_storage_engine=NULL means that temporary tables will use default_storage_engine value. This makes the behavior backward compatible.
Diffstat (limited to 'sql/sys_vars.cc')
-rw-r--r--sql/sys_vars.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index 5fcc33c0e79..cf92a5e6197 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -3292,6 +3292,12 @@ static Sys_var_plugin Sys_storage_engine(
MYSQL_STORAGE_ENGINE_PLUGIN, DEFAULT(&default_storage_engine),
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_not_null));
+static Sys_var_plugin Sys_default_tmp_storage_engine(
+ "default_tmp_storage_engine", "The default storage engine for user-created temporary tables",
+ SESSION_VAR(tmp_table_plugin), NO_CMD_LINE,
+ MYSQL_STORAGE_ENGINE_PLUGIN, DEFAULT(&default_tmp_storage_engine),
+ NO_MUTEX_GUARD, NOT_IN_BINLOG);
+
#if defined(ENABLED_DEBUG_SYNC)
/*
Variable can be set for the session only.