Updated deferred trigger patch.

Neil Conway

diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index e53b74ea28ea9bfede00466b50f07bb9e9545170..65b3ed865d2adcf591b8c5bc3e2ec4a3c9406e95 100644 (file)
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.143 2003/01/08 22:28:32 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.144 2003/01/08 22:29:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2346,11 +2346,6 @@ DeferredTriggerSaveEvent(ResultRelInfo *relinfo, int event, bool row_trigger,
    else
        ItemPointerSetInvalid(&(newctid));
 
-   /*
-    * Create a new event
-    */
-   oldcxt = MemoryContextSwitchTo(deftrig_cxt);
-
    if (row_trigger)
    {
        ntriggers = trigdesc->n_after_row[event];
@@ -2382,6 +2377,11 @@ DeferredTriggerSaveEvent(ResultRelInfo *relinfo, int event, bool row_trigger,
    if (n_enabled_triggers == 0)
        return;
 
+   /*
+    * Create a new event
+    */
+   oldcxt = MemoryContextSwitchTo(deftrig_cxt);
+
    new_size = offsetof(DeferredTriggerEventData, dte_item[0]) +
        n_enabled_triggers * sizeof(DeferredTriggerEventItem);