aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Haas <rhaas@postgresql.org>2011-03-18 10:20:22 -0400
committerRobert Haas <rhaas@postgresql.org>2011-03-18 10:20:22 -0400
commit7a37900443b016e0e7c72f6b42327bc05f8b5003 (patch)
treea288e3f7693f16cbb5ff27e17b5407580dfef291 /src
parentc5eb835bbffb99518405a1e5bccb58c85e0ab30e (diff)
downloadpostgresql-7a37900443b016e0e7c72f6b42327bc05f8b5003.tar.gz
postgresql-7a37900443b016e0e7c72f6b42327bc05f8b5003.zip
Make synchronous replication query cancel/die messages more consistent.
Per a gripe from Thom Brown about my previous commit in this area, commit 9a56dc3389b9470031e9ef8e45c95a680982e01a.
Diffstat (limited to 'src')
-rw-r--r--src/backend/replication/syncrep.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/replication/syncrep.c b/src/backend/replication/syncrep.c
index b70de3993f2..8aef998b47f 100644
--- a/src/backend/replication/syncrep.c
+++ b/src/backend/replication/syncrep.c
@@ -204,8 +204,8 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
{
ereport(WARNING,
(errcode(ERRCODE_ADMIN_SHUTDOWN),
- errmsg("canceling the wait for replication and terminating connection due to administrator command"),
- errdetail("The transaction has already been committed locally but might have not been replicated to the standby.")));
+ errmsg("canceling the wait for synchronous replication and terminating connection due to administrator command"),
+ errdetail("The transaction has already committed locally, but may not have been replicated to the standby.")));
whereToSendOutput = DestNone;
SyncRepCancelWait();
break;
@@ -222,7 +222,7 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
QueryCancelPending = false;
ereport(WARNING,
(errmsg("canceling wait for synchronous replication due to user request"),
- errdetail("The transaction has committed locally, but may not have replicated to the standby.")));
+ errdetail("The transaction has already committed locally, but may not have been replicated to the standby.")));
SyncRepCancelWait();
break;
}