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

sql_select.cc:

Browse Source 
Post-review modifications for the fix of bug #7894.


sql/sql_select.cc:
  Post-review modifications for the fix of bug #7894.
This commit is contained in:
unknown
2005-05-30 05:25:12 -07:00
parent 5a54820003
commit 25841aa9ad
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_select.cc
View File

@ -9197,17 +9197,14 @@ void free_underlaid_joins(THD *thd, SELECT_LEX *select)
1 on error 1 on error
*/ */
static bool change_group_ref(THD *thd, Item *expr, ORDER *group_list, static bool change_group_ref(THD *thd, Item_func *expr, ORDER *group_list,
bool *changed) bool *changed)
{ {
if (expr->type() != Item::FUNC_ITEM) if (expr->arg_count)
return 0;
Item_func *func_item= (Item_func *) expr;
if (func_item->arg_count)
{ {
Item **arg,**arg_end; Item **arg,**arg_end;
for (arg= func_item->arguments(), for (arg= expr->arguments(),
arg_end= func_item->arguments()+func_item->arg_count; arg_end= expr->arguments()+expr->arg_count;
arg != arg_end; arg++) arg != arg_end; arg++)
{ {
Item *item= *arg; Item *item= *arg;
@ -9228,7 +9225,7 @@ static bool change_group_ref(THD *thd, Item *expr, ORDER *group_list,
} }
else if (item->type() == Item::FUNC_ITEM) else if (item->type() == Item::FUNC_ITEM)
{ {
if (change_group_ref(thd, item, group_list, changed)) if (change_group_ref(thd, (Item_func *) item, group_list, changed))
return 1; return 1;
} }
} }
@ -9294,7 +9291,7 @@ bool JOIN::rollup_init()
if (item->type() == Item::FUNC_ITEM) if (item->type() == Item::FUNC_ITEM)
{ {
bool changed= 0; bool changed= 0;
if (change_group_ref(thd, item, group_list, &changed)) if (change_group_ref(thd, (Item_func *) item, group_list, &changed))
return 1; return 1;
/* /*
We have to prevent creation of a field in a temporary table for We have to prevent creation of a field in a temporary table for