Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into gleb.loc:/home/uchum/work/bk/5.1-opt sql/sql_show.cc: Auto merged
This commit is contained in:
commit
285acf57ea
@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user