aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Haas <rhaas@postgresql.org>2014-01-21 11:42:37 -0500
committerRobert Haas <rhaas@postgresql.org>2014-01-21 11:49:13 -0500
commit3888b73f9ac9351071f5c2621e2a00ba8012746f (patch)
treef120db6c5190c41887eb50f04b1aaf63a18ddb72
parentefcdb625b3a7e7142b2bd8990afcef380e0c621e (diff)
downloadpostgresql-3888b73f9ac9351071f5c2621e2a00ba8012746f.tar.gz
postgresql-3888b73f9ac9351071f5c2621e2a00ba8012746f.zip
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.
-rw-r--r--src/backend/utils/misc/guc-file.l1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l
index c91e82bedfd..68917be3261 100644
--- a/src/backend/utils/misc/guc-file.l
+++ b/src/backend/utils/misc/guc-file.l
@@ -444,7 +444,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;
}