diff options
Diffstat (limited to 'src/backend/access/transam/xlog.c')
| -rw-r--r-- | src/backend/access/transam/xlog.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 554491b9a4b..17bd5d85a95 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -4773,7 +4773,6 @@ readRecoveryCommandFile(void) ConfigVariable *item, *head = NULL, *tail = NULL; - bool recoveryPauseAtTargetSet = false; bool recoveryTargetActionSet = false; @@ -4819,25 +4818,6 @@ readRecoveryCommandFile(void) (errmsg_internal("archive_cleanup_command = '%s'", archiveCleanupCommand))); } - else if (strcmp(item->name, "pause_at_recovery_target") == 0) - { - bool recoveryPauseAtTarget; - - if (!parse_bool(item->value, &recoveryPauseAtTarget)) - ereport(ERROR, - (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("parameter \"%s\" requires a Boolean value", "pause_at_recovery_target"))); - - ereport(DEBUG2, - (errmsg_internal("pause_at_recovery_target = '%s'", - item->value))); - - recoveryTargetAction = recoveryPauseAtTarget ? - RECOVERY_TARGET_ACTION_PAUSE : - RECOVERY_TARGET_ACTION_PROMOTE; - - recoveryPauseAtTargetSet = true; - } else if (strcmp(item->name, "recovery_target_action") == 0) { if (strcmp(item->value, "pause") == 0) @@ -5023,18 +5003,6 @@ readRecoveryCommandFile(void) } /* - * Check for mutually exclusive parameters - */ - if (recoveryPauseAtTargetSet && recoveryTargetActionSet) - ereport(ERROR, - (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("cannot set both \"%s\" and \"%s\" recovery parameters", - "pause_at_recovery_target", - "recovery_target_action"), - errhint("The \"pause_at_recovery_target\" is deprecated."))); - - - /* * Override any inconsistent requests. Not that this is a change * of behaviour in 9.5; prior to this we simply ignored a request * to pause if hot_standby = off, which was surprising behaviour. |