8 files changed, 24 insertions, 24 deletions
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index d2cdfb332ee..ded4c7ea61d 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.47 1999/11/22 17:56:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.48 1999/12/10 03:55:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -151,7 +151,7 @@ cluster(char *oldrelname, char *oldindexname)
 
 
 	/* Destroy old heap (along with its index) and rename new. */
-	heap_destroy_with_catalog(oldrelname);
+	heap_drop_with_catalog(oldrelname);
 
 	CommitTransactionCommand();
 	StartTransactionCommand();
diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c
index 84e9331abe7..c26228677e9 100644
--- a/src/backend/commands/command.c
+++ b/src/backend/commands/command.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.58 1999/11/24 00:44:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.59 1999/12/10 03:55:49 momjian Exp $
  *
  * NOTES
  *	  The PortalExecutorHeapMemory crap needs to be eliminated
@@ -242,7 +242,7 @@ PerformPortalClose(char *name, CommandDest dest)
 	 *	Note: PortalCleanup is called as a side-effect
 	 * ----------------
 	 */
-	PortalDestroy(&portal);
+	PortalDrop(&portal);
 }
 
 /* ----------------
diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c
index 6d7ceab1a18..4dded845afd 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.52 1999/11/22 17:56:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.53 1999/12/10 03:55:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -214,7 +214,7 @@ void
 RemoveRelation(char *name)
 {
 	AssertArg(name);
-	heap_destroy_with_catalog(name);
+	heap_drop_with_catalog(name);
 }
 
 /*
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 26f7bcf71b8..d061b15b78d 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.45 1999/11/24 16:52:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.46 1999/12/10 03:55:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -85,7 +85,7 @@ createdb(char *dbname, char *dbpath, int encoding, CommandDest dest)
 }
 
 void
-destroydb(char *dbname, CommandDest dest)
+dropdb(char *dbname, CommandDest dest)
 {
 	int4		user_id;
 	Oid			db_id;
@@ -101,7 +101,7 @@ destroydb(char *dbname, CommandDest dest)
 	 * If this call returns, the database exists and we're allowed to
 	 * remove it.
 	 */
-	check_permissions("destroydb", dbpath, dbname, &db_id, &user_id);
+	check_permissions("dropdb", dbpath, dbname, &db_id, &user_id);
 
 	/* do as much checking as we can... */
 	if (!OidIsValid(db_id))
@@ -308,13 +308,13 @@ check_permissions(char *command,
 		elog(ERROR, "createdb: database '%s' already exists", dbname);
 
 	}
-	else if (!dbfound && !strcmp(command, "destroydb"))
+	else if (!dbfound && !strcmp(command, "dropdb"))
 	{
 
-		elog(ERROR, "destroydb: database '%s' does not exist", dbname);
+		elog(ERROR, "dropdb: database '%s' does not exist", dbname);
 
 	}
-	else if (dbfound && !strcmp(command, "destroydb")
+	else if (dbfound && !strcmp(command, "dropdb")
 			 && dbowner != *userIdP && use_super == false)
 	{
 
@@ -322,7 +322,7 @@ check_permissions(char *command,
 
 	}
 
-	if (dbfound && !strcmp(command, "destroydb"))
+	if (dbfound && !strcmp(command, "dropdb"))
 		strcpy(dbpath, path);
 }	/* check_permissions() */
 
@@ -331,7 +331,7 @@ check_permissions(char *command,
  *
  *	This is currently dead code, since we don't *have* vacuum daemons.
  *	If you want to re-enable it, think about the interlock against deleting
- *	a database out from under running backends, in destroydb() above.
+ *	a database out from under running backends, in dropdb() above.
  */
 static void
 stop_vacuum(char *dbpath, char *dbname)
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 62eed986657..ab3badf9704 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.14 1999/11/22 17:56:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.15 1999/12/10 03:55:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -564,5 +564,5 @@ RemoveIndex(char *name)
 			 ((Form_pg_class) GETSTRUCT(tuple))->relkind);
 	}
 
-	index_destroy(tuple->t_data->t_oid);
+	index_drop(tuple->t_data->t_oid);
 }
diff --git a/src/backend/commands/remove.c b/src/backend/commands/remove.c
index 65366a8ad7c..6cf94518e2d 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.40 1999/11/22 17:56:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.41 1999/12/10 03:55:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -234,7 +234,7 @@ AttributeAndRelationRemove(Oid typeOid)
 			char	   *name;
 
 			name = NameStr(((Form_pg_class) GETSTRUCT(tup))->relname);
-			heap_destroy_with_catalog(name);
+			heap_drop_with_catalog(name);
 		}
 		heap_endscan(scan);
 	}
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 7e5d19ec67d..7e0c47ef4af 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.129 1999/12/01 00:29:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.130 1999/12/10 03:55:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -218,7 +218,7 @@ vc_shutdown()
 	/*
 	 * Release our portal for cross-transaction memory.
 	 */
-	PortalDestroy(&vc_portal);
+	PortalDrop(&vc_portal);
 
 	/* okay, we're done */
 	VacuumRunning = false;
@@ -230,13 +230,13 @@ vc_shutdown()
 void
 vc_abort()
 {
-	/* Clear flag first, to avoid recursion if PortalDestroy elog's */
+	/* Clear flag first, to avoid recursion if PortalDrop elog's */
 	VacuumRunning = false;
 
 	/*
 	 * Release our portal for cross-transaction memory.
 	 */
-	PortalDestroy(&vc_portal);
+	PortalDrop(&vc_portal);
 }
 
 /*
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index 65c46d271a5..4729566721d 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: view.c,v 1.39 1999/10/07 04:23:00 tgl Exp $
+ *	$Id: view.c,v 1.40 1999/12/10 03:55:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -305,6 +305,6 @@ RemoveView(char *viewName)
 	/*
 	 * now remove the relation.
 	 */
-	heap_destroy_with_catalog(viewName);
+	heap_drop_with_catalog(viewName);
 	pfree(rname);
 }