diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/access/transam.h | 9 | ||||
| -rw-r--r-- | src/include/catalog/pg_control.h | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/include/access/transam.h b/src/include/access/transam.h index b23a663c53a..87609e6f81c 100644 --- a/src/include/access/transam.h +++ b/src/include/access/transam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/transam.h,v 1.68 2009/05/08 03:21:35 momjian Exp $ + * $PostgreSQL: pgsql/src/include/access/transam.h,v 1.69 2009/08/31 02:23:23 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -90,7 +90,7 @@ * just one struct with different fields that are protected by different * LWLocks. * - * Note: xidWrapLimit and limit_datname are not "active" values, but are + * Note: xidWrapLimit and oldestXidDB are not "active" values, but are * used just to generate useful messages when xidWarnLimit or xidStopLimit * are exceeded. */ @@ -112,7 +112,7 @@ typedef struct VariableCacheData TransactionId xidWarnLimit; /* start complaining here */ TransactionId xidStopLimit; /* refuse to advance nextXid beyond here */ TransactionId xidWrapLimit; /* where the world ends */ - NameData limit_datname; /* database that needs vacuumed first */ + Oid oldestXidDB; /* database with minimum datfrozenxid */ /* * These fields are protected by ProcArrayLock. @@ -155,7 +155,8 @@ extern XLogRecPtr TransactionIdGetCommitLSN(TransactionId xid); extern TransactionId GetNewTransactionId(bool isSubXact); extern TransactionId ReadNewTransactionId(void); extern void SetTransactionIdLimit(TransactionId oldest_datfrozenxid, - Name oldest_datname); + Oid oldest_datoid); +extern bool TransactionIdLimitIsValid(void); extern Oid GetNewObjectId(void); #endif /* TRAMSAM_H */ diff --git a/src/include/catalog/pg_control.h b/src/include/catalog/pg_control.h index 0312509e65d..c7a740ca710 100644 --- a/src/include/catalog/pg_control.h +++ b/src/include/catalog/pg_control.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_control.h,v 1.43 2009/01/01 17:23:57 momjian Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_control.h,v 1.44 2009/08/31 02:23:23 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,7 @@ /* Version identifier for this pg_control format */ -#define PG_CONTROL_VERSION 843 +#define PG_CONTROL_VERSION 851 /* * Body of CheckPoint XLOG records. This is declared here because we keep @@ -37,6 +37,8 @@ typedef struct CheckPoint Oid nextOid; /* next free OID */ MultiXactId nextMulti; /* next free MultiXactId */ MultiXactOffset nextMultiOffset; /* next free MultiXact offset */ + TransactionId oldestXid; /* cluster-wide minimum datfrozenxid */ + Oid oldestXidDB; /* database with minimum datfrozenxid */ pg_time_t time; /* time stamp of checkpoint */ } CheckPoint; |