diff options
| author | monty@mishka.local <> | 2004-09-15 22:36:57 +0300 |
|---|---|---|
| committer | monty@mishka.local <> | 2004-09-15 22:36:57 +0300 |
| commit | 37864e2727718a1e266461a0704104ce1cb6d436 (patch) | |
| tree | c54782bf59455786d3d6b7abf02e40aaac69b1ff /sql/sql_union.cc | |
| parent | 91ff64e107866821efc8591fc6ecf28f3b7ee9a0 (diff) | |
| parent | d24f293601327d6309be082295da4aa8d2f48f11 (diff) | |
| download | mariadb-git-37864e2727718a1e266461a0704104ce1cb6d436.tar.gz | |
Merge
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index d23e11d5443..1df419d04c3 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -293,7 +293,7 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, Field **field; Item_arena *arena= thd->current_arena; Item_arena backup; - if (!arena->is_stmt_prepare()) + if (arena->is_conventional()) arena= 0; else thd->set_n_backup_item_arena(arena, &backup); |