From 3d8d5e66ccea96d2fe4eaa93cb53480d3cf39da8 Mon Sep 17 00:00:00 2001
From: totaj <totaj@qq.com>
Date: Mon, 19 Feb 2024 14:07:19 +0800
Subject: [PATCH] Fix loadsqlplugin lead CurrentResourceOwner to null.

---
 src/gausskernel/process/tcop/postgres.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gausskernel/process/tcop/postgres.cpp b/src/gausskernel/process/tcop/postgres.cpp
index 55adb4834..d709d2c50 100755
--- a/src/gausskernel/process/tcop/postgres.cpp
+++ b/src/gausskernel/process/tcop/postgres.cpp
@@ -7695,6 +7695,8 @@ void RemoveTempNamespace()
 void LoadSqlPlugin()
 {
     if (u_sess->proc_cxt.MyDatabaseId != InvalidOid && DB_IS_CMPT(B_FORMAT) && IsFileExisted(DOLPHIN)) {
+        /* start_xact_command will change CurrentResourceOwner, so save it here */
+        ResourceOwner save = t_thrd.utils_cxt.CurrentResourceOwner;
         if (!u_sess->attr.attr_sql.dolphin &&
 #ifdef ENABLE_LITE_MODE
             u_sess->attr.attr_common.upgrade_mode == 0
@@ -7724,6 +7726,7 @@ void LoadSqlPlugin()
             PG_CATCH();
             {
                 pthread_mutex_unlock(&g_instance.loadPluginLock[DB_CMPT_B]);
+                t_thrd.utils_cxt.CurrentResourceOwner = save;
                 PG_RE_THROW();
             }
             PG_END_TRY();
@@ -7731,6 +7734,7 @@ void LoadSqlPlugin()
         } else if (u_sess->attr.attr_sql.dolphin) {
             InitBSqlPluginHookIfNeeded();
         }
+        t_thrd.utils_cxt.CurrentResourceOwner = save;
     } else if (u_sess->proc_cxt.MyDatabaseId != InvalidOid && DB_IS_CMPT(A_FORMAT) && u_sess->attr.attr_sql.whale) {
         InitASqlPluginHookIfNeeded();
     }