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

robertmhaas · robertmhaas · commit 3888b73f9ac9 · 2014-01-21T11:49:13.000-05:00
Commit a5bca4e 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
@@ -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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -444,7 +444,6 @@ ParseConfigFile(const char config_file, const char calling_file, bool strict,`
`444`	`444`	`ereport(LOG,`
`445`	`445`	`(errmsg("skipping missing configuration file \"%s\"",`
`446`	`446`	`abs_path)));`
`447`		`- OK = true;`
`448`	`447`	`goto cleanup;`
`449`	`448`	`}`
`450`	`449`