summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2013-01-26 01:59:27 +0200
committerMichael Widenius <monty@askmonty.org>2013-01-26 01:59:27 +0200
commit772bd60a1be92df0e04838aab51bb6e4b228e15a (patch)
tree7aee62ea254866aa34b9fbef87eb6cc82d6d016c /sql
parent672b293860318b290374757f9b6a7f90b8942570 (diff)
parentea1d5943c5aa4e66fa3f36333043dc6fed0a9d60 (diff)
downloadmariadb-git-772bd60a1be92df0e04838aab51bb6e4b228e15a.tar.gz
Automatic merge
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_truncate.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_truncate.cc b/sql/sql_truncate.cc
index 979dde30ceb..4b77344c042 100644
--- a/sql/sql_truncate.cc
+++ b/sql/sql_truncate.cc
@@ -263,6 +263,7 @@ static bool recreate_temporary_table(THD *thd, TABLE *table)
DBUG_ENTER("recreate_temporary_table");
memset(&create_info, 0, sizeof(create_info));
+ create_info.options|= HA_LEX_CREATE_TMP_TABLE;
table->file->info(HA_STATUS_AUTO | HA_STATUS_NO_LOCK);