1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix conflict on rebase of GIS functions to main branch

Browse Source
This commit is contained in:
Dave Gosselin 2025-04-21 09:03:31 -04:00 committed by Dave Gosselin
parent db49003660
commit 7a1c3666d7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/item_sum.cc
View File

@ -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;
} }