database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-13 18:28:01 +03:00
Code Activity

Most of the code follows the American spelling of the word, which is

Browse Source 
"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
This commit is contained in:
Bruce Momjian
2002-11-19 17:21:40 +00:00
parent cd55a2b1be
commit af26857a27
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/tcop/postgres.c
View File

@@ -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");
}
/*