diff options
| author | unknown <serg@serg.mylan> | 2005-06-15 19:58:35 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-06-15 19:58:35 +0200 |
| commit | bb7b0c05dfc38ec386f7460905f8a77e596e1f92 (patch) | |
| tree | d0e401b0b62ca77791bca2ee213877cb2919beea /sql/table.cc | |
| parent | b1f213865132e3dc337b24c12975e7212e7c1661 (diff) | |
| download | mariadb-git-bb7b0c05dfc38ec386f7460905f8a77e596e1f92.tar.gz | |
renamed:
Item_buff -> Cached_item
Item_arena -> Query_arena
TEST_ASSERT -> YYERROR_UNLESS
sql/item.h:
renamed:
Item_buff -> Cached_item
sql/item_buff.cc:
renamed:
Item_buff -> Cached_item
sql/item_func.cc:
renamed:
Item_arena -> Query_arena
sql/item_subselect.cc:
renamed:
Item_arena -> Query_arena
sql/sp_head.cc:
renamed:
Item_arena -> Query_arena
sql/sp_head.h:
renamed:
Item_arena -> Query_arena
sql/sql_base.cc:
renamed:
Item_arena -> Query_arena
sql/sql_class.cc:
renamed:
Item_arena -> Query_arena
sql/sql_class.h:
renamed:
Item_arena -> Query_arena
sql/sql_lex.cc:
renamed:
Item_arena -> Query_arena
sql/sql_prepare.cc:
renamed:
Item_arena -> Query_arena
sql/sql_select.cc:
renamed:
Item_arena -> Query_arena
sql/sql_select.h:
renamed:
Item_buff -> Cached_item
Item_arena -> Query_arena
sql/sql_union.cc:
renamed:
Item_arena -> Query_arena
sql/sql_view.cc:
renamed:
Item_arena -> Query_arena
sql/sql_yacc.yy:
renamed:
TEST_ASSERT -> YYERROR_UNLESS
sql/table.cc:
renamed:
Item_arena -> Query_arena
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index 33cee79eb61..55beac10812 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1926,7 +1926,7 @@ bool st_table_list::setup_ancestor(THD *thd, Item **conds, (check_opt_type == VIEW_CHECK_CASCADED && ancestor->check_option)) { - Item_arena *arena= thd->current_arena, backup; + Query_arena *arena= thd->current_arena, backup; TABLE_LIST *tbl= this; if (arena->is_conventional()) arena= 0; // For easier test @@ -2016,7 +2016,7 @@ bool st_table_list::setup_ancestor(THD *thd, Item **conds, /* full text function moving to current select */ if (view->select_lex.ftfunc_list->elements) { - Item_arena *arena= thd->current_arena, backup; + Query_arena *arena= thd->current_arena, backup; if (arena->is_conventional()) arena= 0; // For easier test else |