diff options
Diffstat (limited to 'src/include/storage/standby.h')
| -rw-r--r-- | src/include/storage/standby.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/include/storage/standby.h b/src/include/storage/standby.h index 3f2e2c2d855..8c982cffb63 100644 --- a/src/include/storage/standby.h +++ b/src/include/storage/standby.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/standby.h,v 1.3 2010/01/14 11:08:02 sriggs Exp $ + * $PostgreSQL: pgsql/src/include/storage/standby.h,v 1.4 2010/01/16 10:05:57 sriggs Exp $ * *------------------------------------------------------------------------- */ @@ -19,11 +19,6 @@ extern int vacuum_defer_cleanup_age; -/* cancel modes for ResolveRecoveryConflictWithVirtualXIDs */ -#define CONFLICT_MODE_NOT_SET 0 -#define CONFLICT_MODE_ERROR 1 /* Conflict can be resolved by canceling query */ -#define CONFLICT_MODE_FATAL 2 /* Conflict can only be resolved by disconnecting session */ - extern void ResolveRecoveryConflictWithSnapshot(TransactionId latestRemovedXid); extern void ResolveRecoveryConflictWithTablespace(Oid tsid); extern void ResolveRecoveryConflictWithDatabase(Oid dbid); |