diff options
| author | bell@sanja.is.com.ua <> | 2005-09-02 17:06:15 +0300 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2005-09-02 17:06:15 +0300 |
| commit | 8553349638b660b5f83e1cb6dddde552b825a03b (patch) | |
| tree | b072c3337b2152fea18dd7f22c27f48c2990d344 /sql/table.cc | |
| parent | d67c683404aca3c6d0efdfc73fea5d8d85b57c95 (diff) | |
| parent | a3ddcdf8fbf2058eeae6d7db7f1dc99785329d7b (diff) | |
| download | mariadb-git-8553349638b660b5f83e1cb6dddde552b825a03b.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/table.cc b/sql/table.cc index 40f30dc15d8..9d681141b1b 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1780,7 +1780,7 @@ bool st_table_list::setup_ancestor(THD *thd) /* Create view fields translation table */ if (!(transl= - (Field_translator*)(thd->current_arena-> + (Field_translator*)(thd->stmt_arena-> alloc(select->item_list.elements * sizeof(Field_translator))))) { @@ -1856,8 +1856,8 @@ bool st_table_list::prep_where(THD *thd, Item **conds, if (!no_where_clause && !where_processed) { TABLE_LIST *tbl= this; - Query_arena *arena= thd->current_arena, backup; - arena= thd->change_arena_if_needed(&backup); // For easier test + Query_arena *arena= thd->stmt_arena, backup; + arena= thd->activate_stmt_arena_if_needed(&backup); // For easier test /* Go up to join tree and try to find left join */ for (; tbl; tbl= tbl->embedding) @@ -1877,7 +1877,7 @@ bool st_table_list::prep_where(THD *thd, Item **conds, if (tbl == 0) *conds= and_conds(*conds, where); if (arena) - thd->restore_backup_item_arena(arena, &backup); + thd->restore_active_arena(arena, &backup); where_processed= TRUE; } } |