summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
diff options
context:
space:
mode:
authorunknown <sanja@montyprogram.com>2013-06-27 17:42:18 +0300
committerunknown <sanja@montyprogram.com>2013-06-27 17:42:18 +0300
commit70092601bc3fa0fbae06b12c1e77b81d05bc3224 (patch)
tree41d08024013f6b845fb23be2defcc31d9e1009a2 /sql/sql_insert.cc
parent94d722b6a43b86ee760f07915921cf58f9869a5d (diff)
downloadmariadb-git-70092601bc3fa0fbae06b12c1e77b81d05bc3224.tar.gz
merge of 2876.430.11 & 2876.430.1
CF_PREOPEN_TMP_TABLES & CF_HA_CLOSE & Patch for Bug#11746602 (27480: Extend CREATE TEMPORARY TABLES privilege to allow temp table operations).
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r--sql/sql_insert.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index be8915c83e1..12222fddca9 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -3918,10 +3918,10 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info,
{
/*
This shouldn't happen as creation of temporary table should make
- it preparable for open. But let us do close_temporary_table() here
- just in case.
+ it preparable for open. Anyway we can't drop temporary table if
+ we are unable to find it.
*/
- drop_temporary_table(thd, create_table, NULL);
+ DBUG_ASSERT(0);
}
else
table= create_table->table;