From 6dd9aa47711c0611d8d0d47ba51247b6dd39c8e1 Mon Sep 17 00:00:00 2001
From: Vinod Sridharan <14185211+visridha@users.noreply.github.com>
Date: Fri, 31 Oct 2025 00:21:58 -0700
Subject: [PATCH] Update GUC setting to not crash with ASAN (#8301)

The GUC configuration for SkipAdvisoryLockPermissionChecks had
misconfigured the settings for GUC_SUPERUSER_ONLY for PGC_SUSET - when
PostgreSQL running with ASAN, this fails when querying pg_settings due
to exceeding the size of the array GucContext_Names. Fix up this GUC
declaration to not crash with ASAN.

(cherry picked from commit 86010de73398646b4ae879261792199bea094f43)
---
 src/backend/distributed/shared_library_init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/distributed/shared_library_init.c b/src/backend/distributed/shared_library_init.c
index a7e2f16b0..13f97fbb9 100644
--- a/src/backend/distributed/shared_library_init.c
+++ b/src/backend/distributed/shared_library_init.c
@@ -2377,8 +2377,8 @@ RegisterCitusConfigVariables(void)
 		NULL,
 		&SkipAdvisoryLockPermissionChecks,
 		false,
-		GUC_SUPERUSER_ONLY,
-		GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE,
+		PGC_SUSET,
+		GUC_SUPERUSER_ONLY | GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE,
 		NULL, NULL, NULL);
 
 	DefineCustomBoolVariable(