3 files changed, 5 insertions, 33 deletions
diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c
index ba94496cea5..baa4e67b33d 100644
--- a/src/backend/utils/adt/sets.c
+++ b/src/backend/utils/adt/sets.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.28 1999/11/24 00:44:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.29 2000/01/17 23:57:46 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -113,9 +113,7 @@ SetDefine(char *querystr, char *typename)
 									  replNull,
 									  repl);
 
-			setheapoverride(true);
 			heap_update(procrel, &tup->t_self, newtup, NULL);
-			setheapoverride(false);
 
 			setoid = newtup->t_data->t_oid;
 		}
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index c9f26f38ad0..aa76d46862f 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.56 2000/01/10 16:13:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.57 2000/01/17 23:57:46 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1047,8 +1047,7 @@ SearchSysCache(struct catcache * cache,
 	 *	if this isn't bootstrap (initdb) time, use the index.
 	 * ----------------
 	 */
-	CACHE2_elog(DEBUG, "SearchSysCache: performing scan (override==%d)",
-				heapisoverride());
+	CACHE1_elog(DEBUG, "SearchSysCache: performing scan");
 
 	if ((RelationGetForm(relation))->relhasindex
 		&& !IsBootstrapProcessingMode())
diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c
index 4a96c5736cf..32479fb2780 100644
--- a/src/backend/utils/time/tqual.c
+++ b/src/backend/utils/time/tqual.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.33 1999/12/10 12:34:14 wieck Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.34 2000/01/17 23:57:47 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,31 +26,6 @@ Snapshot	SerializableSnapshot = NULL;
 
 bool		ReferentialIntegritySnapshotOverride = false;
 
-/*
- * XXX Transaction system override hacks start here
- */
-#ifndef GOODAMI
-
-TransactionId HeapSpecialTransactionId = InvalidTransactionId;
-CommandId	HeapSpecialCommandId = FirstCommandId;
-
-void
-setheapoverride(bool on)
-{
-	if (on)
-	{
-		TransactionIdStore(GetCurrentTransactionId(),
-						   &HeapSpecialTransactionId);
-		HeapSpecialCommandId = GetCurrentCommandId();
-	}
-	else
-		HeapSpecialTransactionId = InvalidTransactionId;
-}
-
-#endif	 /* !defined(GOODAMI) */
-/*
- * XXX Transaction system override hacks end here
- */
 
 /*
  * HeapTupleSatisfiesItself
@@ -311,7 +286,7 @@ HeapTupleSatisfiesUpdate(HeapTuple tuple)
 		}
 		else if (TransactionIdIsCurrentTransactionId(th->t_xmin))
 		{
-			if (CommandIdGEScanCommandId(th->t_cmin) && !heapisoverride())
+			if (CommandIdGEScanCommandId(th->t_cmin))
 				return HeapTupleInvisible;		/* inserted after scan
 												 * started */