diff options
author | Jan Wieck <JanWieck@Yahoo.com> | 1999-12-16 22:20:03 +0000 |
---|---|---|
committer | Jan Wieck <JanWieck@Yahoo.com> | 1999-12-16 22:20:03 +0000 |
commit | 397e9b32a3c2b2c72dcb9cb99cbf2a162aadcb73 (patch) | |
tree | 17583111e0e7c2ca83b94040d48a1036f870b9a4 /src/backend/commands/trigger.c | |
parent | 5ca971a18a708341dd49f27c23fec40ea4342d13 (diff) | |
download | postgresql-397e9b32a3c2b2c72dcb9cb99cbf2a162aadcb73.tar.gz postgresql-397e9b32a3c2b2c72dcb9cb99cbf2a162aadcb73.zip |
Some changes to prepare for LONG attributes.
Jan
Diffstat (limited to 'src/backend/commands/trigger.c')
-rw-r--r-- | src/backend/commands/trigger.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index 695b216fb55..2615ea43cce 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -235,7 +235,7 @@ CreateTrigger(CreateTrigStmt *stmt) CatalogOpenIndices(Num_pg_trigger_indices, Name_pg_trigger_indices, idescs); CatalogIndexInsert(idescs, Num_pg_trigger_indices, tgrel, tuple); CatalogCloseIndices(Num_pg_trigger_indices, idescs); - pfree(tuple); + heap_freetuple(tuple); heap_close(tgrel, RowExclusiveLock); pfree(DatumGetPointer(values[Anum_pg_trigger_tgname - 1])); @@ -255,7 +255,7 @@ CreateTrigger(CreateTrigStmt *stmt) CatalogOpenIndices(Num_pg_class_indices, Name_pg_class_indices, ridescs); CatalogIndexInsert(ridescs, Num_pg_class_indices, pgrel, tuple); CatalogCloseIndices(Num_pg_class_indices, ridescs); - pfree(tuple); + heap_freetuple(tuple); heap_close(pgrel, RowExclusiveLock); CommandCounterIncrement(); @@ -334,7 +334,7 @@ DropTrigger(DropTrigStmt *stmt) CatalogOpenIndices(Num_pg_class_indices, Name_pg_class_indices, ridescs); CatalogIndexInsert(ridescs, Num_pg_class_indices, pgrel, tuple); CatalogCloseIndices(Num_pg_class_indices, ridescs); - pfree(tuple); + heap_freetuple(tuple); heap_close(pgrel, RowExclusiveLock); CommandCounterIncrement(); @@ -690,7 +690,7 @@ ExecBRInsertTriggers(Relation rel, HeapTuple trigtuple) if (newtuple == NULL) break; else if (oldtuple != newtuple && oldtuple != trigtuple) - pfree(oldtuple); + heap_freetuple(oldtuple); } CurrentTriggerData = NULL; pfree(SaveTriggerData); @@ -735,11 +735,11 @@ ExecBRDeleteTriggers(EState *estate, ItemPointer tupleid) if (newtuple == NULL) break; if (newtuple != trigtuple) - pfree(newtuple); + heap_freetuple(newtuple); } CurrentTriggerData = NULL; pfree(SaveTriggerData); - pfree(trigtuple); + heap_freetuple(trigtuple); return (newtuple == NULL) ? false : true; } @@ -793,11 +793,11 @@ ExecBRUpdateTriggers(EState *estate, ItemPointer tupleid, HeapTuple newtuple) if (newtuple == NULL) break; else if (oldtuple != newtuple && oldtuple != intuple) - pfree(oldtuple); + heap_freetuple(oldtuple); } CurrentTriggerData = NULL; pfree(SaveTriggerData); - pfree(trigtuple); + heap_freetuple(trigtuple); return newtuple; } @@ -886,6 +886,7 @@ ltrmark:; Assert(ItemIdIsUsed(lp)); + tuple.t_datamcxt = NULL; tuple.t_data = (HeapTupleHeader) PageGetItem((Page) dp, lp); tuple.t_len = ItemIdGetLength(lp); tuple.t_self = *tid; @@ -1150,7 +1151,7 @@ deferredTriggerExecute(DeferredTriggerEvent event, int itemno) rettuple = ExecCallTriggerFunc(SaveTriggerData.tg_trigger); CurrentTriggerData = NULL; if (rettuple != NULL && rettuple != &oldtuple && rettuple != &newtuple) - pfree(rettuple); + heap_freetuple(rettuple); /* ---------- * Might have been a referential integrity constraint trigger. |