pgsql: Back-patch some minor bug fixes in GUC code.

From: Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us>
To: pgsql-committers(at)postgresql(dot)org
Subject: pgsql: Back-patch some minor bug fixes in GUC code.
Date: 2015-06-28 22:38:18
Message-ID: E1Z9LDO-0000n3-1U@gemulon.postgresql.org
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-committers

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.

Branch
------
REL9_4_STABLE

Details
-------
http://git.postgresql.org/pg/commitdiff/1afc1fe9c7bb72652ff9681c2e59a5751a33cda1

Modified Files
--------------
src/backend/utils/misc/guc-file.l | 50 ++++++++++++++++++++++++++++++-------
src/backend/utils/misc/guc.c | 6 ++++-
src/include/utils/guc.h | 6 ++++-
3 files changed, 51 insertions(+), 11 deletions(-)

Browse pgsql-committers by date

  From Date Subject
Next Message Tom Lane 2015-06-28 22:42:55 Re: pgsql: Fix the fallback memory barrier implementation to be reentrant.
Previous Message Tom Lane 2015-06-28 22:06:27 pgsql: Improve design and implementation of pg_file_settings view.