diff options
| author | Bruce Momjian <bruce@momjian.us> | 1997-11-28 17:28:02 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1997-11-28 17:28:02 +0000 |
| commit | 002796b5ca9c727526ed5231d90f2a7b6b6cf4a9 (patch) | |
| tree | 134153833ca7be8b3ea736b88d0717bc12786929 /src/backend/executor | |
| parent | c445ba331b4de54eb79f6a71c09e9c1666de9b69 (diff) | |
| download | postgresql-002796b5ca9c727526ed5231d90f2a7b6b6cf4a9.tar.gz | |
Rename heap_destroyr to heap_destroy, heap_destroy to heap_destroy_with_catalog.
Diffstat (limited to 'src/backend/executor')
| -rw-r--r-- | src/backend/executor/execMain.c | 4 | ||||
| -rw-r--r-- | src/backend/executor/nodeMaterial.c | 4 | ||||
| -rw-r--r-- | src/backend/executor/nodeTee.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 4668324267..64876ff9ab 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.34 1997/11/28 04:40:08 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.35 1997/11/28 17:27:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -572,7 +572,7 @@ InitPlan(CmdType operation, Query *parseTree, Plan *plan, EState *estate) /* fixup to prevent zero-length columns in create */ setVarAttrLenForCreateTable(tupdesc, targetList, rangeTable); - intoRelationId = heap_create_and_catalog(intoName, tupdesc); + intoRelationId = heap_create_with_catalog(intoName, tupdesc); #ifdef NOT_USED /* it's copy ... */ resetVarAttrLenForCreateTable(tupdesc); #endif diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c index e863d25a73..f821459f2a 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.10 1997/11/20 23:21:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.11 1997/11/28 17:27:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -319,7 +319,7 @@ ExecEndMaterial(Material *node) matstate = node->matstate; tempRelation = matstate->mat_TempRelation; - heap_destroyr(tempRelation); + heap_destroy(tempRelation); /* ---------------- * close the temp relation and shut down the scan. diff --git a/src/backend/executor/nodeTee.c b/src/backend/executor/nodeTee.c index 8cae9dff30..dc46e94966 100644 --- a/src/backend/executor/nodeTee.c +++ b/src/backend/executor/nodeTee.c @@ -15,7 +15,7 @@ * ExecEndTee * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.12 1997/11/28 04:40:12 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.13 1997/11/28 17:27:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -168,7 +168,7 @@ ExecInitTee(Tee *node, EState *currentEstate, Plan *parent) bufferRel = heap_openr(teeState->tee_bufferRelname); else bufferRel = heap_open( - heap_create_and_catalog(teeState->tee_bufferRelname, tupType)); + heap_create_with_catalog(teeState->tee_bufferRelname, tupType)); } else { @@ -177,7 +177,7 @@ ExecInitTee(Tee *node, EState *currentEstate, Plan *parent) newoid()); /* bufferRel = ExecCreatR(len, tupType, _TEMP_RELATION_ID); */ bufferRel = heap_open( - heap_create_and_catalog(teeState->tee_bufferRelname, tupType)); + heap_create_with_catalog(teeState->tee_bufferRelname, tupType)); } teeState->tee_bufferRel = bufferRel; @@ -519,7 +519,7 @@ ExecEndTee(Tee *node, Plan *parent) bufferRel = teeState->tee_bufferRel; if (bufferRel) { - heap_destroyr(bufferRel); + heap_destroy(bufferRel); teeState->tee_bufferRel = NULL; if (teeState->tee_mcxt) { |