diff options
Diffstat (limited to 'src/backend/access/transam/xact.c')
| -rw-r--r-- | src/backend/access/transam/xact.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index 266b31e0b3e..ba48e727e40 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.156.2.2 2004/10/29 22:20:03 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.156.2.3 2006/05/21 20:06:43 tgl Exp $ * * NOTES * Transaction aborts can now occur two ways: @@ -1054,9 +1054,14 @@ AbortTransaction(void) /* * check the current transaction state + * + * reduced to DEBUG2 because this is expected when rejecting an + * invalidly-encoded query outside a transaction block. PG 8.0 + * and up fix it better, but it's not worth back-porting those + * changes to 7.4. */ if (s->state != TRANS_INPROGRESS) - elog(WARNING, "AbortTransaction and not in in-progress state"); + elog(DEBUG2, "AbortTransaction and not in in-progress state"); /* * set the current transaction state information appropriately during |