Improve xid wraparound message (the server isn't really shut down, just

not accepting queries).

         errmsg("database is not accepting queries to avoid
	 wraparound data loss in database \"%s\"",
         errhint("Stop the postmaster and use a standalone
	 backend to VACUUM database \"%s\".",

diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c
index 9edb028a1cc5f314dc5ab84dcf83cf8b523e20e9..99d9213af0cf89b5ca746b950d12473f89b0bd02 100644 (file)
--- a/src/backend/access/transam/varsup.c
+++ b/src/backend/access/transam/varsup.c
@@ -6,7 +6,7 @@
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/access/transam/varsup.c,v 1.65 2005/08/12 01:35:55 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/access/transam/varsup.c,v 1.66 2005/08/22 16:59:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -66,9 +66,9 @@ GetNewTransactionId(bool isSubXact)
                        TransactionIdFollowsOrEquals(xid, ShmemVariableCache->xidStopLimit))
                        ereport(ERROR,
                                        (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-                                        errmsg("database is shut down to avoid wraparound data loss in database \"%s\"",
+                                        errmsg("database is not accepting queries to avoid wraparound data loss in database \"%s\"",
                                                        NameStr(ShmemVariableCache->limit_datname)),
-                                        errhint("Stop the postmaster and use a standalone backend to VACUUM in \"%s\".",
+                                        errhint("Stop the postmaster and use a standalone backend to VACUUM database \"%s\".",
                                                         NameStr(ShmemVariableCache->limit_datname))));
                else
                        ereport(WARNING,