Fix conflict on rebase of GIS functions to main branch
This commit is contained in:
parent
db49003660
commit
7a1c3666d7
@ -3543,7 +3543,7 @@ Item_sum_str::fix_fields(THD *thd, Item **ref)
|
|||||||
/* We should ignore FIELD's in arguments to sum functions */
|
/* We should ignore FIELD's in arguments to sum functions */
|
||||||
with_flags|= (args[i]->with_flags & ~item_with_t::FIELD);
|
with_flags|= (args[i]->with_flags & ~item_with_t::FIELD);
|
||||||
if (args[i]->check_type_can_return_str(
|
if (args[i]->check_type_can_return_str(
|
||||||
Item_func_group_concat::func_name_cstring()))
|
func_name_cstring()))
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user