diff options
Diffstat (limited to 'src/backend/commands/copy.c')
| -rw-r--r-- | src/backend/commands/copy.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 5d60df28735..4ad49409c55 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.317 2009/09/21 20:10:21 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.318 2009/11/20 20:38:10 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1799,8 +1799,12 @@ CopyFrom(CopyState cstate) resultRelInfo->ri_RelationDesc = cstate->rel; resultRelInfo->ri_TrigDesc = CopyTriggerDesc(cstate->rel->trigdesc); if (resultRelInfo->ri_TrigDesc) + { resultRelInfo->ri_TrigFunctions = (FmgrInfo *) palloc0(resultRelInfo->ri_TrigDesc->numtriggers * sizeof(FmgrInfo)); + resultRelInfo->ri_TrigWhenExprs = (List **) + palloc0(resultRelInfo->ri_TrigDesc->numtriggers * sizeof(List *)); + } resultRelInfo->ri_TrigInstrument = NULL; ExecOpenIndices(resultRelInfo); @@ -1810,7 +1814,8 @@ CopyFrom(CopyState cstate) estate->es_result_relation_info = resultRelInfo; /* Set up a tuple slot too */ - slot = MakeSingleTupleTableSlot(tupDesc); + slot = ExecInitExtraTupleSlot(estate); + ExecSetSlotDescriptor(slot, tupDesc); econtext = GetPerTupleExprContext(estate); @@ -2198,7 +2203,7 @@ CopyFrom(CopyState cstate) pfree(defmap); pfree(defexprs); - ExecDropSingleTupleTableSlot(slot); + ExecResetTupleTable(estate->es_tupleTable, false); ExecCloseIndices(resultRelInfo); |