diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2011-06-29 09:26:14 +0300 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2011-07-02 23:30:01 +0300 |
| commit | 6b23ba1093d298a41463a24f091c6f86be406449 (patch) | |
| tree | 70329bb4476d1226cea9547b23a18535d1785c32 /src/backend/access/transam/xlog.c | |
| parent | 678a6d03441fc5acb18fdd43afdd2dd4145c0593 (diff) | |
| download | postgresql-6b23ba1093d298a41463a24f091c6f86be406449.tar.gz postgresql-6b23ba1093d298a41463a24f091c6f86be406449.zip | |
Unify spelling of "canceled", "canceling", "cancellation"
We had previously (af26857a2775e7ceb0916155e931008c2116632f)
established the U.S. spellings as standard.
Diffstat (limited to 'src/backend/access/transam/xlog.c')
| -rw-r--r-- | src/backend/access/transam/xlog.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index aa0b0291ee1..eca7a4038dc 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -8375,13 +8375,13 @@ xlog_redo(XLogRecPtr lsn, XLogRecord *record) /* * If we see a shutdown checkpoint while waiting for an end-of-backup - * record, the backup was cancelled and the end-of-backup record will + * record, the backup was canceled and the end-of-backup record will * never arrive. */ if (InArchiveRecovery && !XLogRecPtrIsInvalid(ControlFile->backupStartPoint)) ereport(ERROR, - (errmsg("online backup was cancelled, recovery cannot continue"))); + (errmsg("online backup was canceled, recovery cannot continue"))); /* * If we see a shutdown checkpoint, we know that nothing was running @@ -9337,7 +9337,7 @@ do_pg_stop_backup(char *labelfile, bool waitforarchive) (errmsg("pg_stop_backup still waiting for all required WAL segments to be archived (%d seconds elapsed)", waits), errhint("Check that your archive_command is executing properly. " - "pg_stop_backup can be cancelled safely, " + "pg_stop_backup can be canceled safely, " "but the database backup will not be usable without all the WAL segments."))); } } @@ -9819,13 +9819,13 @@ CancelBackup(void) if (stat(BACKUP_LABEL_FILE, &stat_buf) < 0) return; - /* remove leftover file from previously cancelled backup if it exists */ + /* remove leftover file from previously canceled backup if it exists */ unlink(BACKUP_LABEL_OLD); if (rename(BACKUP_LABEL_FILE, BACKUP_LABEL_OLD) == 0) { ereport(LOG, - (errmsg("online backup mode cancelled"), + (errmsg("online backup mode canceled"), errdetail("\"%s\" was renamed to \"%s\".", BACKUP_LABEL_FILE, BACKUP_LABEL_OLD))); } @@ -9833,7 +9833,7 @@ CancelBackup(void) { ereport(WARNING, (errcode_for_file_access(), - errmsg("online backup mode was not cancelled"), + errmsg("online backup mode was not canceled"), errdetail("Could not rename \"%s\" to \"%s\": %m.", BACKUP_LABEL_FILE, BACKUP_LABEL_OLD))); } |