aboutsummaryrefslogtreecommitdiff
path: root/src/backend/tcop/postgres.c
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2011-06-29 09:26:14 +0300
committerPeter Eisentraut <peter_e@gmx.net>2011-06-29 09:28:46 +0300
commit21f1e15aafb13ab2430e831a3da7d4d4f525d1ce (patch)
tree5afdaf08c48c5e29d17590c9db4213d79174f111 /src/backend/tcop/postgres.c
parent465883b0a2b4236ba6b31b648a9eabef3b7cdddb (diff)
downloadpostgresql-21f1e15aafb13ab2430e831a3da7d4d4f525d1ce.tar.gz
postgresql-21f1e15aafb13ab2430e831a3da7d4d4f525d1ce.zip
Unify spelling of "canceled", "canceling", "cancellation"
We had previously (af26857a2775e7ceb0916155e931008c2116632f) established the U.S. spellings as standard.
Diffstat (limited to 'src/backend/tcop/postgres.c')
-rw-r--r--src/backend/tcop/postgres.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index a07661f02ab..80d07f8f2da 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -179,7 +179,7 @@ static int UseNewLine = 1; /* Use newlines query delimiters (the default) */
static int UseNewLine = 0; /* Use EOF as query delimiters */
#endif /* TCOP_DONTUSENEWLINE */
-/* whether or not, and why, we were cancelled by conflict with recovery */
+/* whether or not, and why, we were canceled by conflict with recovery */
static bool RecoveryConflictPending = false;
static bool RecoveryConflictRetryable = true;
static ProcSignalReason RecoveryConflictReason;