diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2001-03-18 20:18:59 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2001-03-18 20:18:59 +0000 |
| commit | af6e88a9cfefcb1549a61ed7642c9837599fd0a7 (patch) | |
| tree | 44fd66c2b8ee43508f030c85e36e1bb0dce9e083 /src/include/access | |
| parent | ddc5bc958aa637206461318e7467cfb6c41b52c2 (diff) | |
| download | postgresql-af6e88a9cfefcb1549a61ed7642c9837599fd0a7.tar.gz postgresql-af6e88a9cfefcb1549a61ed7642c9837599fd0a7.zip | |
Remove NEXTXID xlog record type to avoid three-way deadlock risk.
NEXTXID isn't really necessary, per previous discussion in pghackers,
but I mulishy insisted we should put it in anyway. Mea culpa.
Diffstat (limited to 'src/include/access')
| -rw-r--r-- | src/include/access/transam.h | 7 | ||||
| -rw-r--r-- | src/include/access/xlog.h | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/include/access/transam.h b/src/include/access/transam.h index 460de699886..9007c24e899 100644 --- a/src/include/access/transam.h +++ b/src/include/access/transam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: transam.h,v 1.30 2001/03/13 01:17:06 tgl Exp $ + * $Id: transam.h,v 1.31 2001/03/18 20:18:59 tgl Exp $ * * NOTES * Transaction System Version 101 now support proper oid @@ -129,9 +129,8 @@ typedef VariableRelationContentsData *VariableRelationContents; typedef struct VariableCacheData { TransactionId nextXid; /* next XID to assign */ - uint32 xidCount; /* XIDs available before must do XLOG work */ - Oid nextOid; /* and similarly for OIDs */ - uint32 oidCount; + Oid nextOid; /* next OID to assign */ + uint32 oidCount; /* OIDs available before must do XLOG work */ } VariableCacheData; typedef VariableCacheData *VariableCache; diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h index d2dfb2e31c6..b1808dfc26f 100644 --- a/src/include/access/xlog.h +++ b/src/include/access/xlog.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: xlog.h,v 1.21 2001/03/16 05:44:33 tgl Exp $ + * $Id: xlog.h,v 1.22 2001/03/18 20:18:59 tgl Exp $ */ #ifndef XLOG_H #define XLOG_H @@ -201,7 +201,6 @@ extern void StartupXLOG(void); extern void ShutdownXLOG(void); extern void CreateCheckPoint(bool shutdown); extern void SetThisStartUpID(void); -extern void XLogPutNextXid(TransactionId nextXid); extern void XLogPutNextOid(Oid nextOid); extern void SetRedoRecPtr(void); extern void GetRedoRecPtr(void); |