Allow error query to start transaction in autocommit off mode.

bmomjian · bmomjian · commit 9a9719e48210 · 2003-03-21T04:33:15.000Z
diff --git 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.143 2003/03/14 22:40:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.144 2003/03/21 04:33:15 momjian Exp $
  *
  * NOTES
  *		Transaction aborts can now occur two ways:
@@ -1341,7 +1341,10 @@ AbortCurrentTransaction(void)
 			 */
 		case TBLOCK_DEFAULT:
 			AbortTransaction();
-			CleanupTransaction();
+			if (autocommit || suppressChain)
+				CleanupTransaction();
+			else
+				s->blockState = TBLOCK_ABORT;
 			break;
 
 			/*

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/access/transam/xact.c,v 1.143 2003/03/14 22:40:31 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.144 2003/03/21 04:33:15 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* Transaction aborts can now occur two ways:`
`@@ -1341,7 +1341,10 @@ AbortCurrentTransaction(void)`
`1341`	`1341`	`*/`
`1342`	`1342`	`case TBLOCK_DEFAULT:`
`1343`	`1343`	`AbortTransaction();`
`1344`		`- CleanupTransaction();`
	`1344`	`+ if (autocommit \|\| suppressChain)`
	`1345`	`+ CleanupTransaction();`
	`1346`	`+ else`
	`1347`	`+ s->blockState = TBLOCK_ABORT;`
`1345`	`1348`	`break;`
`1346`	`1349`
`1347`	`1350`	`/*`