diff options
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/cache/temprel.c | 6 | ||||
| -rw-r--r-- | src/backend/utils/mmgr/portalmem.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/utils/cache/temprel.c b/src/backend/utils/cache/temprel.c index 9bf51cfec33..23ac1aadbcf 100644 --- a/src/backend/utils/cache/temprel.c +++ b/src/backend/utils/cache/temprel.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.17 1999/11/16 16:55:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.18 1999/12/10 03:56:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -98,10 +98,10 @@ remove_all_temp_relations(void) /* safe from deallocation */ strcpy(relname, temp_rel->user_relname); - heap_destroy_with_catalog(relname); + heap_drop_with_catalog(relname); } else - index_destroy(temp_rel->relid); + index_drop(temp_rel->relid); l = next; } diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c index 4120c24dd67..aaec2dfd65a 100644 --- a/src/backend/utils/mmgr/portalmem.c +++ b/src/backend/utils/mmgr/portalmem.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.30 1999/09/23 17:02:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.31 1999/12/10 03:56:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -438,7 +438,7 @@ CollectNamedPortals(Portal *portalP, int destroy) int i; for (i = 0; i < listIndex; i++) - PortalDestroy(&portalList[i]); + PortalDrop(&portalList[i]); listIndex = 0; } else @@ -546,7 +546,7 @@ EnablePortalManager(bool on) { /* cleanup */ if (PortalIsValid(BlankPortal)) { - PortalDestroy(&BlankPortal); + PortalDrop(&BlankPortal); MemoryContextFree((MemoryContext) PortalMemory, (Pointer) BlankPortal); BlankPortal = NULL; @@ -555,7 +555,7 @@ EnablePortalManager(bool on) /* * Each portal must free its non-memory resources specially. */ - HashTableWalk(PortalHashTable, PortalDestroy, 0); + HashTableWalk(PortalHashTable, PortalDrop, 0); hash_destroy(PortalHashTable); PortalHashTable = NULL; @@ -774,7 +774,7 @@ CreatePortal(char *name) /* XXX PortalName */ } /* - * PortalDestroy + * PortalDrop * Destroys portal. * * Exceptions: @@ -782,7 +782,7 @@ CreatePortal(char *name) /* XXX PortalName */ * BadArg if portal is invalid. */ void -PortalDestroy(Portal *portalP) +PortalDrop(Portal *portalP) { Portal portal = *portalP; |