From 264a64ba18bd8345f1a43cbfba042236b441571e Mon Sep 17 00:00:00 2001
From: PeterWeiWang <715533650@qq.com>
Date: Tue, 19 Oct 2021 15:18:48 +0800
Subject: [PATCH] =?UTF-8?q?valgrind=E5=A4=B1=E8=B4=A5=E7=94=A8=E4=BE=8Bmai?=
 =?UTF-8?q?n.func=5Fmisc=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/item.h           | 2 ++
 sql/pq_clone_item.cc | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/sql/item.h b/sql/item.h
index e3a5b59f39f8..479fa27cb315 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -3329,6 +3329,8 @@ class Item_name_const final : public Item {
   }
 
   Item *pq_clone(THD *thd, SELECT_LEX *select) override;
+  bool pq_copy_from(THD *thd, SELECT_LEX *select, Item *item) override;
+
  protected:
   type_conversion_status save_in_field_inner(Field *field,
                                              bool no_conversions) override {
diff --git a/sql/pq_clone_item.cc b/sql/pq_clone_item.cc
index bf861fb31e94..58a9a081664e 100644
--- a/sql/pq_clone_item.cc
+++ b/sql/pq_clone_item.cc
@@ -498,6 +498,13 @@ PQ_CLONE_DEF(Item_name_const) {
   }
 PQ_CLONE_RETURN
 
+PQ_COPY_FROM_DEF(Item_name_const, Item) {
+    if (orig_item != nullptr) {
+      valid_args = orig_item->valid_args;
+    }
+  }
+PQ_COPY_FROM_RETURN
+
 /* Item_result_field start */
 /* Item_func start */
 PQ_COPY_FROM_DEF(Item_func, Item_result_field) {