IsTransactionBlock() should return true in TBLOCK_ABORT state.

tglsfdc · tglsfdc · commit 6645a7386310 · 1999-09-05T17:12:34.000Z
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.49 1999/09/04 19:55:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.50 1999/09/05 17:12:34 tgl Exp $
  *
  * NOTES
  *		Transaction aborts can now occur two ways:
@@ -1530,6 +1530,7 @@ IsTransactionBlock()
 	TransactionState s = CurrentTransactionState;
 
 	if (s->blockState == TBLOCK_INPROGRESS
+		|| s->blockState == TBLOCK_ABORT
 		|| s->blockState == TBLOCK_ENDABORT)
 		return true;
 

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/access/transam/xact.c,v 1.49 1999/09/04 19:55:48 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.50 1999/09/05 17:12:34 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* Transaction aborts can now occur two ways:`
`@@ -1530,6 +1530,7 @@ IsTransactionBlock()`
`1530`	`1530`	`TransactionState s = CurrentTransactionState;`
`1531`	`1531`
`1532`	`1532`	`if (s->blockState == TBLOCK_INPROGRESS`
	`1533`	`+ \|\| s->blockState == TBLOCK_ABORT`
`1533`	`1534`	`\|\| s->blockState == TBLOCK_ENDABORT)`
`1534`	`1535`	`return true;`
`1535`	`1536`