From: Tomas Vondra <tomas@2ndquadrant.com>
Date: Wed, 9 Nov 2016 14:05:57 +0000 (+0100)
Subject: fix AtEOXact_GUC - add missing_ok=true to GetConfigOptionByName()
X-Git-Tag: XL_10_R1BETA1~514
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=917888b44b5d22920f1462ee4c7c9c006b2287fb;p=postgres-xl.git

fix AtEOXact_GUC - add missing_ok=true to GetConfigOptionByName()

Maybe this should be 'false' though, not sure.

Also moved the variable into the block, to minimize difference
with respect to upstream.
---

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index be7adb2ac5..eaeaadb9cd 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -5429,7 +5429,6 @@ AtEOXact_GUC(bool isCommit, int nestLevel)
 			bool		restorePrior = false;
 			bool		restoreMasked = false;
 			bool		changed;
-			const char		*newvalStr = NULL;
 
 			/*
 			 * In this next bit, if we don't set either restorePrior or
@@ -5646,7 +5645,11 @@ AtEOXact_GUC(bool isCommit, int nestLevel)
 
 			if (changed)
 			{
-				newvalStr = GetConfigOptionByName(gconf->name, NULL);
+				const char		*newvalStr = NULL;
+
+				/* XXX perhaps this should use is_missing=false, not sure */
+				newvalStr = GetConfigOptionByName(gconf->name, NULL, true);
+
 				/*
 				 * Quote value if it is including memory or time units
 				 */