Reduce error level of ROLLBACK outside a transaction from WARNING to

NOTICE.

diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 5b7c04169a7cbd21ce1dc7ed9ab55e0d662a2ca6..b7ab95858650bec7d6fba7a3ed802e1a60597b54 100644 (file)
--- 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 ba5ecedc0a22d2507934cf71840cf0c465a07c9e..257722e94a99765b4c59bf9ed72982bd6eb00dca 100644 (file)
--- 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