1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Back-patch some minor bug fixes in GUC code.

Browse Source 
In 9.4, fix a 9.4.1 regression that allowed multiple entries for a
PGC_POSTMASTER variable to cause bogus complaints in the postmaster log.
(The issue here was that commit bf007a27acd7b2fb unintentionally reverted
3e3f65973a3c94a6, which suppressed any duplicate entries within
ParseConfigFp.  Back-patch the reimplementation just made in HEAD, which
makes use of an "ignore" field to prevent application of superseded items.)

Add missed failure check in AlterSystemSetConfigFile().  We don't really
expect ParseConfigFp() to fail, but that's not an excuse for not checking.

In both 9.3 and 9.4, remove mistaken assignment to ConfigFileLineno that
caused line counting after an include_dir directive to be completely wrong.
This commit is contained in:
Tom Lane 2015-06-28 18:38:06 -04:00
parent f9b38ab653
commit 5a56c25458
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/backend/utils/misc/guc-file.l
View File

@ -587,7 +587,6 @@ ParseConfigFp(FILE *fp, const char *config_file, int depth, int elevel,
head_p, tail_p)) head_p, tail_p))
OK = false; OK = false;
yy_switch_to_buffer(lex_buffer); yy_switch_to_buffer(lex_buffer);
ConfigFileLineno = save_ConfigFileLineno;
pfree(opt_name); pfree(opt_name);
pfree(opt_value); pfree(opt_value);
} }