Fix for vacuum and cache use. Fix for BSDI 4.0.

2 files changed, 7 insertions, 17 deletions

diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index d54d2584ae8..97accc93db0 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.34 1998/09/01 04:32:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.35 1998/10/12 00:53:33 momjian Exp $
  *
  * Notes:
  *		XXX This needs to use exception.h to handle recovery when
@@ -1108,6 +1108,7 @@ RelationInvalidateCatalogCacheTuple(Relation relation,
 	 */
 	Assert(RelationIsValid(relation));
 	Assert(HeapTupleIsValid(tuple));
+	Assert(PointerIsValid(function));
 	CACHE1_elog(DEBUG, "RelationInvalidateCatalogCacheTuple: called");
 
 	/* ----------------
@@ -1132,9 +1133,11 @@ RelationInvalidateCatalogCacheTuple(Relation relation,
 		if (relationId != ccp->relationId)
 			continue;
 
+#ifdef NOT_USED
 		/* OPT inline simplification of CatalogCacheIdInvalidate */
 		if (!PointerIsValid(function))
 			function = CatalogCacheIdInvalidate;
+#endif
 
 		(*function) (ccp->id,
 				 CatalogCacheComputeTupleHashIndex(ccp, relation, tuple),
diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c
index d21540776de..0517e1a0cda 100644
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.16 1998/09/01 04:33:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.17 1998/10/12 00:53:34 momjian Exp $
  *
  * Note - this code is real crufty...
  *
@@ -74,7 +74,6 @@ typedef InvalidationMessageData *InvalidationMessage;
  * ----------------
  */
 static LocalInvalid Invalid = EmptyLocalInvalid;		/* XXX global */
-static bool RefreshWhenInvalidate = false;
 
 Oid			MyRelationRelationId = InvalidOid;
 Oid			MyAttributeRelationId = InvalidOid;
@@ -573,20 +572,6 @@ RegisterInvalid(bool send)
 }
 
 /*
- * SetRefreshWhenInvalidate --
- *		Causes the local caches to be immediately refreshed iff true.
- */
-void
-SetRefreshWhenInvalidate(bool on)
-{
-#ifdef	INVALIDDEBUG
-	elog(DEBUG, "RefreshWhenInvalidate(%d) called", on);
-#endif	 /* defined(INVALIDDEBUG) */
-
-	RefreshWhenInvalidate = on;
-}
-
-/*
  * RelationIdInvalidateHeapTuple --
  *		Causes the given tuple in a relation to be invalidated.
  *
@@ -641,9 +626,11 @@ RelationInvalidateHeapTuple(Relation relation, HeapTuple tuple)
 									tuple,
 									RelationIdRegisterLocalInvalid);
 
+#ifdef NOT_USED
 	if (RefreshWhenInvalidate)
 		/* what does this do?  bjm 1998/08/20 */
 		RelationInvalidateCatalogCacheTuple(relation,
 											tuple,
 											(void (*) ()) NULL);
+#endif
 }