From b9b38f0e4b311c8d550a39e3b9678b1ed176749d Mon Sep 17 00:00:00 2001
From: Dave Gosselin <dave.gosselin@mariadb.com>
Date: Mon, 16 Sep 2024 12:22:09 -0400
Subject: [PATCH] GIS update get_copy overrides to do_get_copy const

---
 sql/item_geofunc.h | 12 ++++++------
 sql/item_sum.h     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sql/item_geofunc.h b/sql/item_geofunc.h
index b5443528f09..c2570ee2a01 100644
--- a/sql/item_geofunc.h
+++ b/sql/item_geofunc.h
@@ -994,7 +994,7 @@ public:
   {
     return &type_handler_geometry;
   }
-  Item *get_copy(THD *thd) override
+  Item *do_get_copy(THD *thd) const override
   { return get_item_copy<Item_func_simplify>(thd, this); }
 };
 
@@ -1040,7 +1040,7 @@ public:
     static LEX_CSTRING name= {STRING_WITH_LEN("st_isvalid") };
     return name;
   }
-  Item *get_copy(THD *thd) override
+  Item *do_get_copy(THD *thd) const override
   { return get_item_copy<Item_func_isvalid>(thd, this); }
 };
 
@@ -1060,7 +1060,7 @@ public:
   {
     return &type_handler_point;
   }
-  Item *get_copy(THD *thd) override
+  Item *do_get_copy(THD *thd) const override
   { return get_item_copy<Item_func_validate>(thd, this); }
 };
 
@@ -1345,7 +1345,7 @@ public:
     static LEX_CSTRING name= {STRING_WITH_LEN("st_latfromgeohash") };
     return name;
   }
-  Item *get_copy(THD *thd) override
+  Item *do_get_copy(THD *thd) const override
   { return get_item_copy<Item_func_latfromgeohash>(thd, this); }
 };
 
@@ -1360,7 +1360,7 @@ public:
     static LEX_CSTRING name= {STRING_WITH_LEN("st_longfromgeohash") };
     return name;
   }
-  Item *get_copy(THD *thd) override
+  Item *do_get_copy(THD *thd) const override
   { return get_item_copy<Item_func_longfromgeohash>(thd, this); }
 };
 
@@ -1380,7 +1380,7 @@ public:
     return name;
   }
   String *val_str(String *) override;
-  Item *get_copy(THD *thd) override
+  Item *do_get_copy(THD *thd) const override
   { return get_item_copy<Item_func_pointfromgeohash>(thd, this); }
 };
 
diff --git a/sql/item_sum.h b/sql/item_sum.h
index dc7f66154d9..7d8377b4bc6 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -2162,7 +2162,7 @@ public:
     return { STRING_WITH_LEN("st_collect(") };
   }
   Item *copy_or_same(THD* thd) override;
-  Item *get_copy(THD *thd) override
+  Item *do_get_copy(THD *thd) const override
   { return get_item_copy<Item_func_collect>(thd, this); }
 
   bool supports_removal() const override