From 82748bc253e00a07f0fcce3959af711b509a4e69 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Sat, 10 Nov 2007 14:36:44 +0000
Subject: [PATCH] Reduce error level of ROLLBACK outside a transaction from
WARNING to NOTICE.
---
src/backend/access/transam/xact.c | 4 ++--
src/test/regress/expected/errors.out | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 5b7c04169a7..b7ab9585865 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.251 2007/09/11 03:28:05 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.252 2007/11/10 14:36:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -3025,7 +3025,7 @@ UserAbortTransactionBlock(void)
* default state.
*/
case TBLOCK_STARTED:
- ereport(WARNING,
+ ereport(NOTICE,
(errcode(ERRCODE_NO_ACTIVE_SQL_TRANSACTION),
errmsg("there is no transaction in progress")));
s->blockState = TBLOCK_ABORT_PENDING;
diff --git a/src/test/regress/expected/errors.out b/src/test/regress/expected/errors.out
index ba5ecedc0a2..257722e94a9 100644
--- a/src/test/regress/expected/errors.out
+++ b/src/test/regress/expected/errors.out
@@ -116,7 +116,7 @@ ERROR: column "oid" of relation "stud_emp" already exists
-- not in a xact
abort;
-WARNING: there is no transaction in progress
+NOTICE: there is no transaction in progress
-- not in a xact
end;
WARNING: there is no transaction in progress
--
GitLab