database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-29 10:41:53 +03:00
Code Activity

Unify spelling of "canceled", "canceling", "cancellation"

Browse Source 
We had previously (af26857a27)
established the U.S. spellings as standard.
This commit is contained in:
Peter Eisentraut
2011-06-29 09:26:14 +03:00
parent 465883b0a2
commit 21f1e15aaf
30 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/access/transam/xlog.c
View File

@ -8379,13 +8379,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
@ -9341,7 +9341,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.")));
}
}
@ -9823,13 +9823,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)));
}
@ -9837,7 +9837,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)));
}