From 522e8bf80a7c16758445666423168eed27ba7439 Mon Sep 17 00:00:00 2001
From: chenlinfeng <723609220@qq.com>
Date: Mon, 12 Jul 2021 16:24:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B9=B6=E8=A1=8C=E5=86=85?=
 =?UTF-8?q?=E5=AD=98=E5=8D=A0=E7=94=A8=E8=AE=A1=E7=AE=97=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sql/sql_optimizer.cc b/sql/sql_optimizer.cc
index 0a15780d2be3..639e2cc9e71a 100644
--- a/sql/sql_optimizer.cc
+++ b/sql/sql_optimizer.cc
@@ -969,7 +969,7 @@ bool JOIN::optimize() {
   if (thd->m_suite_for_pq == PqConditionStatus::ENABLED)
   {
     // save temp table param for later PQ scan
-    saved_tmp_table_param = new (thd->pq_mem_root) Temp_table_param();
+    saved_tmp_table_param = new (thd->mem_root) Temp_table_param();
     if (!saved_tmp_table_param) return true;
 
     saved_tmp_table_param->pq_copy(tmp_table_param);