database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Code cleanup

Browse Source
This commit is contained in:
bell@laptop.sanja.is.com.ua
2003-08-16 13:26:48 +03:00
parent 55094f903f
commit 85f397781b
12 changed files with 30 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_select.cc
View File

@ -294,10 +294,7 @@ JOIN::prepare(Item ***rref_pointer_array,
setup_wild(thd, tables_list,
fields_list,
&all_fields, wild_num))) ||
setup_ref_array(thd, rref_pointer_array, (fields_list.elements +
select_lex->
select_n_having_items +
og_num)) ||
select_lex->setup_ref_array(thd, og_num) ||
setup_fields(thd, (*rref_pointer_array), tables_list, fields_list, 1,
&all_fields, 1) ||
setup_without_group(thd, (*rref_pointer_array), tables_list, fields_list,
@ -7483,19 +7480,6 @@ find_order_in_list(THD *thd, Item **ref_pointer_array,
return 0;
}
/*
Allocate array of references to address all_fileds list elements
*/
int setup_ref_array(THD* thd, Item ***rref_pointer_array, uint elements)
{
if (*rref_pointer_array)
return 0;
return (*rref_pointer_array=
(Item **)thd->alloc(sizeof(Item*) * elements * 5)) == 0;
}
/*
Change order to point at item in select list. If item isn't a number
and doesn't exits in the select list, add it the the field list.