Fix conflict on rebase of GIS functions to main branch

DaveGosselin-MariaDB · DaveGosselin-MariaDB · commit 7a1c3666d79d · 2025-04-22T16:26:36.000-04:00
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
@@ -3543,7 +3543,7 @@ Item_sum_str::fix_fields(THD *thd, Item **ref)
     /* We should ignore FIELD's in arguments to sum functions */
     with_flags|= (args[i]->with_flags & ~item_with_t::FIELD);
 	if (args[i]->check_type_can_return_str(
-                   Item_func_group_concat::func_name_cstring()))
+                 func_name_cstring()))
       return true;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -3543,7 +3543,7 @@ Item_sum_str::fix_fields(THD thd, Item *ref)`
`3543`	`3543`	`/* We should ignore FIELD's in arguments to sum functions */`
`3544`	`3544`	`with_flags\|= (args[i]->with_flags & ~item_with_t::FIELD);`
`3545`	`3545`	`if (args[i]->check_type_can_return_str(`
`3546`		`- Item_func_group_concat::func_name_cstring()))`
	`3546`	`+ func_name_cstring()))`
`3547`	`3547`	`return true;`
`3548`	`3548`	`}`
`3549`	`3549`