From: Robert Haas <rhaas@postgresql.org>
Date: Tue, 21 Jan 2014 16:42:37 +0000 (-0500)
Subject: Fix inadvertent semantics change in last patch to plug memory leaks.
X-Git-Tag: REL9_4_BETA1~646
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=033b2343fae9d8c9df124cde62087dcb481c9c5e;p=postgresql

Fix inadvertent semantics change in last patch to plug memory leaks.

Commit a5bca4ef034f71175d46462963af2329d22068c2 accidentally changed
the semantics when the "skipping missing configuration file" is
emitted, because it forced OK to true instead of leaving the value
untouched.

Spotted by Tom Lane.
---

diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l
index a5b9d6ac77..e815a9bef9 100644
--- a/src/backend/utils/misc/guc-file.l
+++ b/src/backend/utils/misc/guc-file.l
@@ -476,7 +476,6 @@ ParseConfigFile(const char *config_file, const char *calling_file, bool strict,
 		ereport(LOG,
 				(errmsg("skipping missing configuration file \"%s\"",
 						abs_path)));
-		OK = true;
 		goto cleanup;
 	}