From af6e88a9cfefcb1549a61ed7642c9837599fd0a7 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 18 Mar 2001 20:18:59 +0000
Subject: 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.

---
 src/include/access/transam.h     | 7 +++----
 src/include/access/xlog.h        | 3 +--
 src/include/catalog/pg_control.h | 3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/include')

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);
diff --git a/src/include/catalog/pg_control.h b/src/include/catalog/pg_control.h
index 97d0e13e783..4dcb120469b 100644
--- a/src/include/catalog/pg_control.h
+++ b/src/include/catalog/pg_control.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_control.h,v 1.1 2001/03/13 01:17:06 tgl Exp $
+ * $Id: pg_control.h,v 1.2 2001/03/18 20:18:59 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -45,7 +45,6 @@ typedef struct CheckPoint
 /* XLOG info values for XLOG rmgr */
 #define XLOG_CHECKPOINT_SHUTDOWN		0x00
 #define XLOG_CHECKPOINT_ONLINE			0x10
-#define XLOG_NEXTXID					0x20
 #define XLOG_NEXTOID					0x30
 
 
-- 
cgit v1.2.3