From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Thu, 6 Dec 2007 14:32:54 +0000 (+0000)
Subject: Change wording of logged message when cancelling an autovacuum task, using
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=b3f359e952ab6a98d8a0fbfb842dcb55d0b49ff1;p=users%2Fbernd%2Fpostgres.git

Change wording of logged message when cancelling an autovacuum task, using
american speling (unlike this commit message).  Per complaint from Mike C. on
bug #3790 and subsequent discussion.
---

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 8484e5f91b..66538c166d 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -2578,6 +2578,10 @@ ProcessInterrupts(void)
 			ereport(ERROR,
 					(errcode(ERRCODE_QUERY_CANCELED),
 					 errmsg("canceling statement due to statement timeout")));
+		else if (IsAutoVacuumWorkerProcess())
+			ereport(ERROR,
+					(errcode(ERRCODE_QUERY_CANCELED),
+					 errmsg("canceling autovacuum task")));
 		else
 			ereport(ERROR,
 					(errcode(ERRCODE_QUERY_CANCELED),