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 4e48239d193d11696ce5aa21184d3206d26e4a07..6f9c6b8b7a012d29a46b930fe2035e8c2291be5f 100644 (file)
--- a/src/backend/access/transam/varsup.c
+++ b/src/backend/access/transam/varsup.c
@@ -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,