5 files changed, 14 insertions, 14 deletions
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index de0e478860..560eb0ca71 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.18 1997/11/28 04:39:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.19 1997/11/28 17:26:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -175,7 +175,7 @@ cluster(char oldrelname[], char oldindexname[])
 
 
 	/* Destroy old heap (along with its index) and rename new. */
-	heap_destroy(oldrelname);
+	heap_destroy_with_catalog(oldrelname);
 
 	renamerel(NewHeapName, saveoldrelname);
 	TypeRename(NewHeapName, saveoldrelname);
@@ -209,13 +209,13 @@ copy_heap(Oid OIDOldHeap)
 	OldHeapDesc = RelationGetTupleDescriptor(OldHeap);
 
 	/*
-	 * Need to make a copy of the tuple descriptor, heap_create_and_catalog
+	 * Need to make a copy of the tuple descriptor, heap_create_with_catalog
 	 * modifies it.
 	 */
 
 	tupdesc = CreateTupleDescCopy(OldHeapDesc);
 
-	OIDNewHeap = heap_create_and_catalog(NewName, tupdesc);
+	OIDNewHeap = heap_create_with_catalog(NewName, tupdesc);
 
 	if (!OidIsValid(OIDNewHeap))
 		elog(WARN, "clusterheap: cannot create temporary heap relation\n");
diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c
index 36c36dd380..d7fbf6bdbc 100644
--- a/src/backend/commands/creatinh.c
+++ b/src/backend/commands/creatinh.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.20 1997/11/28 04:39:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.21 1997/11/28 17:27:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -137,7 +137,7 @@ DefineRelation(CreateStmt *stmt)
 		}
 	}
 
-	relationId = heap_create_and_catalog(relname, descriptor);
+	relationId = heap_create_with_catalog(relname, descriptor);
 
 	StoreCatalogInheritance(relationId, inheritList);
 }
@@ -157,7 +157,7 @@ void
 RemoveRelation(char *name)
 {
 	AssertArg(name);
-	heap_destroy(name);
+	heap_destroy_with_catalog(name);
 }
 
 
diff --git a/src/backend/commands/recipe.c b/src/backend/commands/recipe.c
index 315a62bf42..288cbf9eb8 100644
--- a/src/backend/commands/recipe.c
+++ b/src/backend/commands/recipe.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/recipe.c,v 1.14 1997/11/28 04:39:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/recipe.c,v 1.15 1997/11/28 17:27:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1047,7 +1047,7 @@ tg_parseSubQuery(TgRecipe * r, TgNode * n, TeeInfo * teeInfo)
 				len = length(q->qtrees[0]->targetList);
 				tupdesc = rel->rd_att;
 
-				relid = heap_create_and_catalog(
+				relid = heap_create_with_catalog(
 						child->nodeElem->outTypes->val[0], tupdesc);
 			}
 			else
@@ -1072,7 +1072,7 @@ tg_parseSubQuery(TgRecipe * r, TgNode * n, TeeInfo * teeInfo)
 				}
 				else
 				{
-					relid = heap_create_and_catalog(
+					relid = heap_create_with_catalog(
 							child->nodeElem->outTypes->val[0], tupdesc);
 				}
 			}
diff --git a/src/backend/commands/remove.c b/src/backend/commands/remove.c
index 3bfdfb0962..393b9e713e 100644
--- a/src/backend/commands/remove.c
+++ b/src/backend/commands/remove.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.17 1997/11/25 21:59:03 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.18 1997/11/28 17:27:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -241,7 +241,7 @@ AttributeAndRelationRemove(Oid typeOid)
 			char	   *name;
 
 			name = (((Form_pg_class) GETSTRUCT(tup))->relname).data;
-			heap_destroy(name);
+			heap_destroy_with_catalog(name);
 		}
 	}
 	heap_endscan(sdesc);
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index a752e3020c..140378d17d 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/view.c,v 1.16 1997/11/25 21:59:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/view.c,v 1.17 1997/11/28 17:27:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -314,6 +314,6 @@ RemoveView(char *viewName)
 	/*
 	 * now remove the relation.
 	 */
-	heap_destroy(viewName);
+	heap_destroy_with_catalog(viewName);
 	pfree(rname);
 }