From 7a1c3666d79dd84e927eae4159eba38559e734bf Mon Sep 17 00:00:00 2001
From: Dave Gosselin <dave.gosselin@mariadb.com>
Date: Mon, 21 Apr 2025 09:03:31 -0400
Subject: [PATCH] Fix conflict on rebase of GIS functions to main branch

---
 sql/item_sum.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index dc616da9d48..4d84b609f46 100644
--- 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;
   }