diff options
| author | serg@serg.mylan <> | 2005-06-15 19:58:35 +0200 |
|---|---|---|
| committer | serg@serg.mylan <> | 2005-06-15 19:58:35 +0200 |
| commit | 01b3c709261bbefcad3a75c6602d071fc34d85dc (patch) | |
| tree | d0e401b0b62ca77791bca2ee213877cb2919beea /sql/sql_union.cc | |
| parent | b41f9b36cb8daee4e4229ea26ad6df433d6f2082 (diff) | |
| download | mariadb-git-01b3c709261bbefcad3a75c6602d071fc34d85dc.tar.gz | |
renamed:
Item_buff -> Cached_item
Item_arena -> Query_arena
TEST_ASSERT -> YYERROR_UNLESS
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 912636b6cf3..f59d7fffe85 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -274,7 +274,7 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, all collations together for UNION. */ List_iterator_fast<Item> tp(types); - Item_arena *arena= thd->current_arena; + Query_arena *arena= thd->current_arena; Item *type; while ((type= tp++)) @@ -308,7 +308,7 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, if (!item_list.elements) { Field **field; - Item_arena *tmp_arena,backup; + Query_arena *tmp_arena,backup; tmp_arena= thd->change_arena_if_needed(&backup); for (field= table->field; *field; field++) |