summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
diff options
context:
space:
mode:
authorserg@serg.mylan <>2005-06-15 19:58:35 +0200
committerserg@serg.mylan <>2005-06-15 19:58:35 +0200
commit01b3c709261bbefcad3a75c6602d071fc34d85dc (patch)
treed0e401b0b62ca77791bca2ee213877cb2919beea /sql/sql_lex.cc
parentb41f9b36cb8daee4e4229ea26ad6df433d6f2082 (diff)
downloadmariadb-git-01b3c709261bbefcad3a75c6602d071fc34d85dc.tar.gz
renamed:
Item_buff -> Cached_item Item_arena -> Query_arena TEST_ASSERT -> YYERROR_UNLESS
Diffstat (limited to 'sql/sql_lex.cc')
-rw-r--r--sql/sql_lex.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 1270aab18ae..8657b738b28 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -1484,8 +1484,8 @@ 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
*/
- Item_arena *arena= thd->current_arena;
- return (ref_pointer_array=
+ Query_arena *arena= thd->current_arena;
+ return (ref_pointer_array=
(Item **)arena->alloc(sizeof(Item*) *
(item_list.elements +
select_n_having_items +