diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-11-19 17:21:40 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-11-19 17:21:40 +0000 |
| commit | af26857a2775e7ceb0916155e931008c2116632f (patch) | |
| tree | 9a5b0fb95b77ec4e17acd9b00bb6543cf93764ec /src/backend/tcop/postgres.c | |
| parent | cd55a2b1be795705d6696b22e7f26c68d71281b7 (diff) | |
| download | postgresql-af26857a2775e7ceb0916155e931008c2116632f.tar.gz postgresql-af26857a2775e7ceb0916155e931008c2116632f.zip | |
Most of the code follows the American spelling of the word, which is
"canceled", so I changed the one remaining usage of the British
spelling ("cancelled") over to the former, and updated the translation
files appropriately.
Neil Conway
Diffstat (limited to 'src/backend/tcop/postgres.c')
| -rw-r--r-- | src/backend/tcop/postgres.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index d09df569ced..457391b6a99 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.309 2002/11/15 00:47:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.310 2002/11/19 17:21:40 momjian Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -1158,7 +1158,7 @@ ProcessInterrupts(void) QueryCancelPending = false; ImmediateInterruptOK = false; /* not idle anymore */ DisableNotifyInterrupt(); - elog(ERROR, "Query was cancelled."); + elog(ERROR, "Query was canceled."); } /* If we get here, do nothing (probably, QueryCancelPending was reset) */ } @@ -1781,7 +1781,7 @@ PostgresMain(int argc, char *argv[], const char *username) if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.309 $ $Date: 2002/11/15 00:47:22 $\n"); + puts("$Revision: 1.310 $ $Date: 2002/11/19 17:21:40 $\n"); } /* |