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 8484e5f91bc81b18b55090fc53474b05f2873f74..66538c166d40c44f47741232fdd2e26c9a48766f 100644 (file)
--- 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),