diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2005-10-29 00:31:52 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2005-10-29 00:31:52 +0000 |
| commit | 07bb9f086bd8ef7a60d6249d723423ec8847efbf (patch) | |
| tree | 0f36fdf98f828e3fa82ea2ee956ee5d4a9c8fc58 /src/backend/access | |
| parent | a7335a3401acf4f322c39087c961f62511545b70 (diff) | |
| download | postgresql-07bb9f086bd8ef7a60d6249d723423ec8847efbf.tar.gz postgresql-07bb9f086bd8ef7a60d6249d723423ec8847efbf.zip | |
Message corrections
Diffstat (limited to 'src/backend/access')
| -rw-r--r-- | src/backend/access/transam/twophase.c | 4 | ||||
| -rw-r--r-- | src/backend/access/transam/varsup.c | 6 | ||||
| -rw-r--r-- | src/backend/access/transam/xlog.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c index 0ece348e184..5423060653d 100644 --- a/src/backend/access/transam/twophase.c +++ b/src/backend/access/transam/twophase.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.15 2005/10/15 02:49:09 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.16 2005/10/29 00:31:50 petere Exp $ * * NOTES * Each global transaction is associated with a global transaction @@ -904,7 +904,7 @@ EndPrepare(GlobalTransaction gxact) close(fd); ereport(ERROR, (errcode_for_file_access(), - errmsg("could not seek twophase state file: %m"))); + errmsg("could not seek in twophase state file: %m"))); } /* diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c index bff646afb61..874a9736c70 100644 --- a/src/backend/access/transam/varsup.c +++ b/src/backend/access/transam/varsup.c @@ -6,7 +6,7 @@ * Copyright (c) 2000-2005, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/transam/varsup.c,v 1.67 2005/10/15 02:49:09 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/varsup.c,v 1.68 2005/10/29 00:31:50 petere Exp $ * *------------------------------------------------------------------------- */ @@ -66,9 +66,9 @@ GetNewTransactionId(bool isSubXact) TransactionIdFollowsOrEquals(xid, ShmemVariableCache->xidStopLimit)) ereport(ERROR, (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), - errmsg("database is not accepting queries to avoid wraparound data loss in database \"%s\"", + errmsg("database is not accepting commands to avoid wraparound data loss in database \"%s\"", NameStr(ShmemVariableCache->limit_datname)), - errhint("Stop the postmaster and use a standalone backend to VACUUM database \"%s\".", + errhint("Stop the postmaster and use a standalone backend to vacuum database \"%s\".", NameStr(ShmemVariableCache->limit_datname)))); else ereport(WARNING, diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 188032c7132..66db5d9dd26 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.221 2005/10/22 20:27:17 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.222 2005/10/29 00:31:50 petere Exp $ * *------------------------------------------------------------------------- */ @@ -1468,7 +1468,7 @@ XLogWrite(XLogwrtRqst WriteRqst, bool flexible) ereport(PANIC, (errcode_for_file_access(), errmsg("could not write to log file %u, segment %u " - "at offset %u length %lu: %m", + "at offset %u, length %lu: %m", openLogId, openLogSeg, openLogOff, (unsigned long) nbytes))); } @@ -3558,7 +3558,7 @@ ReadControlFile(void) if (ControlFile->floatFormat != FLOATFORMAT_VALUE) ereport(FATAL, (errmsg("database files are incompatible with server"), - errdetail("The database cluster appears to use a different floating-point format than the server executable."), + errdetail("The database cluster appears to use a different floating-point number format than the server executable."), errhint("It looks like you need to initdb."))); if (ControlFile->blcksz != BLCKSZ) ereport(FATAL, |