summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
diff options
context:
space:
mode:
authorkonstantin@mysql.com <>2005-09-02 17:21:19 +0400
committerkonstantin@mysql.com <>2005-09-02 17:21:19 +0400
commita3ddcdf8fbf2058eeae6d7db7f1dc99785329d7b (patch)
tree6996d85b80a0fadca8491157c75d719dab155e97 /sql/sql_lex.cc
parentb44b36bd1f216c5682ad3fe17d3747eca063c3c4 (diff)
downloadmariadb-git-a3ddcdf8fbf2058eeae6d7db7f1dc99785329d7b.tar.gz
Rename:
- current_arena to stmt_arena: the thread may have more than one 'current' arenas: one for runtime data, and one for the parsed tree of a statement. Only one of them is active at any moment. - set_item_arena -> set_query_arena, because Item_arena was renamed to Query_arena a while ago - set_n_backup_item_arena -> set_n_backup_active_arena; the active arena is the arena thd->mem_root and thd->free_list are currently pointing at. - restore_backup_item_arena -> restore_active_arena (with the same rationale) - change_arena_if_needed -> activate_stmt_arena_if_needed; this method sets thd->stmt_arena active if it's not done yet.
Diffstat (limited to 'sql/sql_lex.cc')
-rw-r--r--sql/sql_lex.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 86823919378..455c592241a 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -1504,7 +1504,7 @@ bool st_select_lex::setup_ref_array(THD *thd, uint order_group_num)
We have to create array in prepared statement memory if it is
prepared statement
*/
- Query_arena *arena= thd->current_arena;
+ Query_arena *arena= thd->stmt_arena;
return (ref_pointer_array=
(Item **)arena->alloc(sizeof(Item*) *
(item_list.elements +
@@ -1826,7 +1826,7 @@ void st_select_lex_unit::set_limit(SELECT_LEX *sl)
{
ha_rows select_limit_val;
- DBUG_ASSERT(! thd->current_arena->is_stmt_prepare());
+ DBUG_ASSERT(! thd->stmt_arena->is_stmt_prepare());
select_limit_val= (ha_rows)(sl->select_limit ? sl->select_limit->val_uint() :
HA_POS_ERROR);
offset_limit_cnt= (ha_rows)(sl->offset_limit ? sl->offset_limit->val_uint() :
@@ -2038,7 +2038,7 @@ void st_lex::cleanup_after_one_table_open()
void st_select_lex::fix_prepare_information(THD *thd, Item **conds)
{
- if (!thd->current_arena->is_conventional() && first_execution)
+ if (!thd->stmt_arena->is_conventional() && first_execution)
{
first_execution= 0;
if (*conds)