Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 5a56c25

Browse files
committed
Back-patch some minor bug fixes in GUC code.
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 bf007a2 unintentionally reverted 3e3f659, 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.
1 parent f9b38ab commit 5a56c25

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

src/backend/utils/misc/guc-file.l

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,6 @@ ParseConfigFp(FILE *fp, const char *config_file, int depth, int elevel,
587587
head_p, tail_p))
588588
OK = false;
589589
yy_switch_to_buffer(lex_buffer);
590-
ConfigFileLineno = save_ConfigFileLineno;
591590
pfree(opt_name);
592591
pfree(opt_value);
593592
}

0 commit comments

Comments
 (0)