summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r--sql/sql_union.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index d6b776571f2..827d75a9848 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -292,7 +292,9 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
{
Item_arena *arena= thd->current_arena;
Item_arena backup;
- if (arena)
+ if (!arena->is_stmt_prepare())
+ arena= 0
+ else
thd->set_n_backup_item_arena(arena, &backup);
Field **field;
for (field= table->field; *field; field++)