diff options
Diffstat (limited to 'src/backend/utils/misc')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 13 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 5 |
2 files changed, 3 insertions, 15 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index adf9f72b35..642fc6796a 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <peter_e@gmx.net>. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.537 2010/01/29 18:39:05 sriggs Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.538 2010/02/01 13:40:28 sriggs Exp $ * *-------------------------------------------------------------------- */ @@ -1223,17 +1223,6 @@ static struct config_bool ConfigureNamesBool[] = }, { - {"minimize_standby_conflicts", PGC_POSTMASTER, WAL_SETTINGS, - gettext_noop("Additional information is added to WAL records to" - " minimize the number of false positive cancelations" - " caused by recovery conflicts on WAL standby nodes."), - NULL - }, - &MinimizeStandbyConflicts, - false, NULL, NULL - }, - - { {"allow_system_table_mods", PGC_POSTMASTER, DEVELOPER_OPTIONS, gettext_noop("Allows modifications of the structure of system tables."), NULL, diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index 928ccc76ed..c915d19d66 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -184,9 +184,8 @@ # - Hot Standby - #recovery_connections = on # allows connections during recovery -#minimize_standby_conflicts = on # additional WAL info to avoid conflicts -#max_standby_delay = 30 # max acceptable standby lag (s) to help queries - # complete without conflict; -1 disables +#max_standby_delay = 30 # max acceptable standby lag (s) to allow queries + # to complete without conflict; -1 disables # - Replication - |