summaryrefslogtreecommitdiff
path: root/src/backend/utils/misc/guc.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/utils/misc/guc.c')
-rw-r--r--src/backend/utils/misc/guc.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index adf9f72b359..642fc6796a3 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,