mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-27 02:35:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50

Browse source 
into  maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/51
This commit is contained in:
tsmith@maint2.mysql.com 2006-09-13 09:03:52 +02:00
commit 6a31ec2cad
39 changed files with 612 additions and 341 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sql/sql_lex.cc
View file

@ -1531,10 +1531,10 @@ bool st_select_lex::setup_ref_array(THD *thd, uint order_group_num)
*/
Query_arena *arena= thd->stmt_arena;
return (ref_pointer_array=
(Item **)arena->alloc(sizeof(Item*) *
(item_list.elements +
select_n_having_items +
order_group_num)* 5)) == 0;
(Item **)arena->alloc(sizeof(Item*) * (n_child_sum_items +
item_list.elements +
select_n_having_items +
order_group_num)*5)) == 0;
}