postgres.git / summary / log / commit / refs

commit    5a56c254588a91de393b8ce99f8deeefc6a44d67
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Sun Jun 28 22:38:06 2015 +0000

    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 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.


 src/backend/utils/misc/guc-file.l | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l
index 68917be3261..3b19b6dd6cf 100644
--- a/src/backend/utils/misc/guc-file.l
+++ b/src/backend/utils/misc/guc-file.l
@@ -587,7 +587,6 @@ ParseConfigFp(FILE *fp, const char *config_file, int depth, int elevel,
 								 head_p, tail_p))
 				OK = false;
 			yy_switch_to_buffer(lex_buffer);
-			ConfigFileLineno = save_ConfigFileLineno;
 			pfree(opt_name);
 			pfree(opt_value);
 		}


[parent: f9b38ab6536e]