postgrespro
diff --git a/‎src/backend/access/transam/xact.c
Lines changed: 23 additions & 1 deletion b/‎src/backend/access/transam/xact.c
Lines changed: 23 additions & 1 deletion
diff --git a/‎src/backend/catalog/heap.c
Lines changed: 2 additions & 3 deletions b/‎src/backend/catalog/heap.c
Lines changed: 2 additions & 3 deletions
diff --git a/‎src/backend/catalog/indexing.c
Lines changed: 4 additions & 2 deletions b/‎src/backend/catalog/indexing.c
Lines changed: 4 additions & 2 deletions
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.54 1999/09/28 11:41:03 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.55 1999/09/29 16:05:55 wieck Exp $
  *
  * NOTES
  *		Transaction aborts can now occur two ways:
@@ -149,6 +149,7 @@
 #include "commands/async.h"
 #include "commands/sequence.h"
 #include "commands/vacuum.h"
+#include "commands/trigger.h"
 #include "libpq/be-fsstubs.h"
 #include "storage/proc.h"
 #include "storage/sinval.h"
@@ -865,6 +866,12 @@ StartTransaction()
 	 */
 	InitNoNameRelList();
 
+	/* ----------------
+	 *	Tell the trigger manager to we're starting a transaction
+	 * ----------------
+	 */
+	DeferredTriggerBeginXact();
+
 	/* ----------------
 	 *	done with start processing, set current transaction
 	 *	state to "in progress"
@@ -904,6 +911,14 @@ CommitTransaction()
 	if (s->state != TRANS_INPROGRESS)
 		elog(NOTICE, "CommitTransaction and not in in-progress state ");
 
+	/* ----------------
+	 *	Tell the trigger manager that this transaction is about to be
+	 *	committed. He'll invoke all trigger deferred until XACT before
+	 *	we really start on committing the transaction. 
+	 * ----------------
+	 */
+	DeferredTriggerEndXact();
+
 	/* ----------------
 	 *	set the current transaction state information
 	 *	appropriately during the abort processing
@@ -992,6 +1007,13 @@ AbortTransaction()
 	if (s->state != TRANS_INPROGRESS)
 		elog(NOTICE, "AbortTransaction and not in in-progress state ");
 
+	/* ----------------
+	 *	Tell the trigger manager that this transaction is about to be
+	 *	aborted. 
+	 * ----------------
+	 */
+	DeferredTriggerAbortXact();
+
 	/* ----------------
 	 *	set the current transaction state information
 	 *	appropriately during the abort processing
 
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.98 1999/09/24 00:24:11 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.99 1999/09/29 16:05:56 wieck Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -1468,8 +1468,7 @@ heap_destroy_with_catalog(char *relname)
 		RelationRemoveRules(rid);
 
 	/* triggers */
-	if (rel->rd_rel->reltriggers > 0)
-		RelationRemoveTriggers(rel);
+	RelationRemoveTriggers(rel);
 
 	/* ----------------
 	 *	delete attribute tuples
 
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.45 1999/09/18 19:06:33 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.46 1999/09/29 16:05:56 wieck Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -52,7 +52,9 @@ char	   *Name_pg_attrdef_indices[Num_pg_attrdef_indices] = {AttrDefaultIndex};
 
 char	   *Name_pg_relcheck_indices[Num_pg_relcheck_indices] = {RelCheckIndex};
 
-char	   *Name_pg_trigger_indices[Num_pg_trigger_indices] = {TriggerRelidIndex};
+char	   *Name_pg_trigger_indices[Num_pg_trigger_indices] = {TriggerRelidIndex,
+	TriggerConstrNameIndex,
+	TriggerConstrRelidIndex};
 
 
 static HeapTuple CatalogIndexFetchTuple(Relation heapRelation,
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.98 1999/09/24 00:24:11 tgl Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.99 1999/09/29 16:05:56 wieck Exp $`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* INTERFACE ROUTINES`
`@@ -1468,8 +1468,7 @@ heap_destroy_with_catalog(char *relname)`
`1468`	`1468`	`RelationRemoveRules(rid);`
`1469`	`1469`
`1470`	`1470`	`/* triggers */`
`1471`		`- if (rel->rd_rel->reltriggers > 0)`
`1472`		`- RelationRemoveTriggers(rel);`
	`1471`	`+ RelationRemoveTriggers(rel);`
`1473`	`1472`
`1474`	`1473`	`/* ----------------`
`1475`	`1474`	`* delete attribute tuples`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.45 1999/09/18 19:06:33 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.46 1999/09/29 16:05:56 wieck Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -52,7 +52,9 @@ char *Name_pg_attrdef_indices[Num_pg_attrdef_indices] = {AttrDefaultIndex};`
`52`	`52`
`53`	`53`	`char *Name_pg_relcheck_indices[Num_pg_relcheck_indices] = {RelCheckIndex};`
`54`	`54`
`55`		`-char *Name_pg_trigger_indices[Num_pg_trigger_indices] = {TriggerRelidIndex};`
	`55`	`+char *Name_pg_trigger_indices[Num_pg_trigger_indices] = {TriggerRelidIndex,`
	`56`	`+ TriggerConstrNameIndex,`
	`57`	`+ TriggerConstrRelidIndex};`
`56`	`58`
`57`	`59`
`58`	`60`	`static HeapTuple CatalogIndexFetchTuple(Relation heapRelation,`