Commit c205524c authored by gshchepa/uchum@gleb.loc's avatar gshchepa/uchum@gleb.loc

Merge gleb.loc:/home/uchum/work/bk/5.0-opt

into  gleb.loc:/home/uchum/work/bk/5.1-opt
parents 6336d8c1 cdea05a7
...@@ -2250,11 +2250,9 @@ bool uses_only_table_name_fields(Item *item, TABLE_LIST *table) ...@@ -2250,11 +2250,9 @@ bool uses_only_table_name_fields(Item *item, TABLE_LIST *table)
if (item->type() == Item::FUNC_ITEM) if (item->type() == Item::FUNC_ITEM)
{ {
Item_func *item_func= (Item_func*)item; Item_func *item_func= (Item_func*)item;
Item **child; for (uint i=0; i<item_func->argument_count(); i++)
Item **item_end= (item_func->arguments()) + item_func->argument_count();
for (child= item_func->arguments(); child != item_end; child++)
{ {
if (!uses_only_table_name_fields(*child, table)) if (!uses_only_table_name_fields(item_func->arguments()[i], table))
return 0; return 0;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment