From 2a8c4ccf2e5e0a378b0ac52843c8baa5a75175e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Tue, 19 Mar 2024 08:09:31 +0200
Subject: [PATCH] Fix g++-14 -Wtemplate-id-cdtor

---
 plugin/versioning/versioning.cc | 8 ++++----
 sql/item_cmpfunc.h              | 8 +++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/plugin/versioning/versioning.cc b/plugin/versioning/versioning.cc
index 8b9fb74e77b..4ed847b0882 100644
--- a/plugin/versioning/versioning.cc
+++ b/plugin/versioning/versioning.cc
@@ -35,8 +35,8 @@ public:
   static Create_func_trt<TRT_FIELD> s_singleton;
 
 protected:
-  Create_func_trt<TRT_FIELD>() = default;
-  virtual ~Create_func_trt<TRT_FIELD>() = default;
+  Create_func_trt() = default;
+  virtual ~Create_func_trt() = default;
 };
 
 template<TR_table::field_id_t TRT_FIELD>
@@ -131,8 +131,8 @@ public:
   static Create_func_trt_trx_sees<Item_func_trt_trx_seesX> s_singleton;
 
 protected:
-  Create_func_trt_trx_sees<Item_func_trt_trx_seesX>() = default;
-  virtual ~Create_func_trt_trx_sees<Item_func_trt_trx_seesX>() = default;
+  Create_func_trt_trx_sees() = default;
+  virtual ~Create_func_trt_trx_sees() = default;
 };
 
 template<class X>
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index 1ae0e652e88..a8868c26899 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -3301,13 +3301,11 @@ template <template<class> class LI, typename T> class Item_equal_iterator
 {
 protected:
   Item_equal *item_equal;
-  Item *curr_item;
+  Item *curr_item= nullptr;
 public:
-  Item_equal_iterator<LI,T>(Item_equal &item_eq) 
-    :LI<T> (item_eq.equal_items)
+  Item_equal_iterator(Item_equal &item_eq)
+    :LI<T> (item_eq.equal_items), item_equal(&item_eq)
   {
-    curr_item= NULL;
-    item_equal= &item_eq;
     if (item_eq.with_const)
     {
       LI<T> *list_it= this;