6 files changed, 15 insertions, 15 deletions
diff --git a/src/backend/executor/_deadcode/nodeTee.c b/src/backend/executor/_deadcode/nodeTee.c
index 7cab4084a86..1931ebcf535 100644
--- a/src/backend/executor/_deadcode/nodeTee.c
+++ b/src/backend/executor/_deadcode/nodeTee.c
@@ -14,7 +14,7 @@
  *		ExecInitTee
  *		ExecEndTee
  *
- *	$Id: nodeTee.c,v 1.5 1999/07/16 04:58:54 momjian Exp $
+ *	$Id: nodeTee.c,v 1.6 1999/12/10 03:55:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -470,7 +470,7 @@ ExecEndTee(Tee * node, Plan *parent)
 		bufferRel = teeState->tee_bufferRel;
 		if (bufferRel)
 		{
-			heap_destroy(bufferRel);
+			heap_drop(bufferRel);
 			teeState->tee_bufferRel = NULL;
 			if (teeState->tee_mcxt)
 			{
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 4d5b25a7d9f..bea42714aa4 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,7 +26,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.101 1999/11/24 00:44:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.102 1999/12/10 03:55:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -778,7 +778,7 @@ EndPlan(Plan *plan, EState *estate)
 	{
 		TupleTable	tupleTable = (TupleTable) estate->es_tupleTable;
 
-		ExecDestroyTupleTable(tupleTable, true);
+		ExecDropTupleTable(tupleTable, true);
 		estate->es_tupleTable = NULL;
 	}
 
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index f1f6d15f1b0..e31d7993a28 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.32 1999/11/23 20:06:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.33 1999/12/10 03:55:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,7 +23,7 @@
  *
  *	 TABLE CREATE/DELETE
  *		ExecCreateTupleTable	- create a new tuple table
- *		ExecDestroyTupleTable	- destroy a table
+ *		ExecDropTupleTable	- destroy a table
  *
  *	 SLOT RESERVERATION
  *		ExecAllocTableSlot		- find an available slot in the table
@@ -84,7 +84,7 @@
  *
  *		At ExecEnd()
  *		----------------
- *		- EndPlan() calls ExecDestroyTupleTable() to clean up any remaining
+ *		- EndPlan() calls ExecDropTupleTable() to clean up any remaining
  *		  tuples left over from executing the query.
  *
  *		The important thing to watch in the executor code is how pointers
@@ -178,7 +178,7 @@ ExecCreateTupleTable(int initialSize)	/* initial number of slots in
 }
 
 /* --------------------------------
- *		ExecDestroyTupleTable
+ *		ExecDropTupleTable
  *
  *		This pfrees the storage assigned to the tuple table and
  *		optionally pfrees the contents of the table also.
@@ -186,7 +186,7 @@ ExecCreateTupleTable(int initialSize)	/* initial number of slots in
  * --------------------------------
  */
 void
-ExecDestroyTupleTable(TupleTable table, /* tuple table */
+ExecDropTupleTable(TupleTable table, /* tuple table */
 					  bool shouldFree)	/* true if we should free slot
 										 * contents */
 {
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index c6295acf723..12dbcec122f 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -6,7 +6,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  *
- *	$Id: nodeHash.c,v 1.39 1999/10/13 15:02:25 tgl Exp $
+ *	$Id: nodeHash.c,v 1.40 1999/12/10 03:55:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -439,7 +439,7 @@ ExecHashTableDestroy(HashJoinTable hashtable)
 
 	/* Destroy the portal to release all working memory */
 	/* cast here is a kluge for circular includes... */
-	PortalDestroy((Portal *) &hashtable->myPortal);
+	PortalDrop((Portal *) &hashtable->myPortal);
 
 	/* And drop the control block */
 	pfree(hashtable);
diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c
index 24232617cf6..c80152d61d8 100644
--- a/src/backend/executor/nodeMaterial.c
+++ b/src/backend/executor/nodeMaterial.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.26 1999/09/24 00:24:23 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.27 1999/12/10 03:55:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -311,7 +311,7 @@ ExecEndMaterial(Material *node)
 	matstate = node->matstate;
 	tempRelation = matstate->mat_TempRelation;
 
-	heap_destroy(tempRelation);
+	heap_drop(tempRelation);
 
 	/* ----------------
 	 *	close the temp relation and shut down the scan.
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index e99475942b9..c0231ce317a 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -3,7 +3,7 @@
  * spi.c
  *				Server Programming Interface
  *
- * $Id: spi.c,v 1.42 1999/11/22 17:56:05 momjian Exp $
+ * $Id: spi.c,v 1.43 1999/12/10 03:55:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -127,7 +127,7 @@ SPI_finish()
 
 	/* Restore memory context as it was before procedure call */
 	MemoryContextSwitchTo(_SPI_current->savedcxt);
-	PortalDestroy(&(_SPI_current->portal));
+	PortalDrop(&(_SPI_current->portal));
 
 	SetScanCommandId(_SPI_current->savedId);