aboutsummaryrefslogtreecommitdiff
path: root/src/backend/tcop/postgres.c
diff options
context:
space:
mode:
authorAlvaro Herrera <alvherre@alvh.no-ip.org>2007-12-06 14:32:54 +0000
committerAlvaro Herrera <alvherre@alvh.no-ip.org>2007-12-06 14:32:54 +0000
commit59c841506c5b659bc570d49220313ef680ab236c (patch)
tree8f82f56db9418c9cfe1b5537d8789753784d10c6 /src/backend/tcop/postgres.c
parent53e99f57fcfef00cb1a09126d82919b9b1e15af6 (diff)
downloadpostgresql-59c841506c5b659bc570d49220313ef680ab236c.tar.gz
postgresql-59c841506c5b659bc570d49220313ef680ab236c.zip
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.
Diffstat (limited to 'src/backend/tcop/postgres.c')
-rw-r--r--src/backend/tcop/postgres.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 43435966c95..8e2ca618a23 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.538 2007/11/15 21:14:38 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.539 2007/12/06 14:32:54 alvherre Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -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),