diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2001-05-04 18:39:16 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2001-05-04 18:39:16 +0000 |
| commit | e2e19ca0cdb47a7359f29359b8d47f0a298b22f6 (patch) | |
| tree | 6df411d6f44311f9d5242108b459c88173ca7662 | |
| parent | 602b742507f9598b1d3ba1c8d9a016ac101fafbc (diff) | |
| download | postgresql-e2e19ca0cdb47a7359f29359b8d47f0a298b22f6.tar.gz postgresql-e2e19ca0cdb47a7359f29359b8d47f0a298b22f6.zip | |
Seems like we should not hold off cancel/die interrupts while we are
running deferred triggers. They are really part of the regular
transaction, and they could take awhile.
| -rw-r--r-- | src/backend/access/transam/xact.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index c88e665a7ec..4e13d689f1f 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.101 2001/03/22 06:16:10 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.102 2001/05/04 18:39:16 tgl Exp $ * * NOTES * Transaction aborts can now occur two ways: @@ -1026,9 +1026,6 @@ CommitTransaction(void) if (s->state != TRANS_INPROGRESS) elog(NOTICE, "CommitTransaction and not in in-progress state "); - /* Prevent cancel/die interrupt while cleaning up */ - HOLD_INTERRUPTS(); - /* * Tell the trigger manager that this transaction is about to be * committed. He'll invoke all trigger deferred until XACT before we @@ -1036,6 +1033,9 @@ CommitTransaction(void) */ DeferredTriggerEndXact(); + /* Prevent cancel/die interrupt while cleaning up */ + HOLD_INTERRUPTS(); + /* * set the current transaction state information appropriately during * the abort processing |