diff options
Diffstat (limited to 'src/backend/access')
| -rw-r--r-- | src/backend/access/gist/gistxlog.c | 4 | ||||
| -rw-r--r-- | src/backend/access/hash/hashscan.c | 4 | ||||
| -rw-r--r-- | src/backend/access/nbtree/nbtxlog.c | 4 | ||||
| -rw-r--r-- | src/backend/access/transam/xact.c | 4 | ||||
| -rw-r--r-- | src/backend/access/transam/xlog.c | 6 |
5 files changed, 11 insertions, 11 deletions
diff --git a/src/backend/access/gist/gistxlog.c b/src/backend/access/gist/gistxlog.c index ab2288a97f0..821cc221bbb 100644 --- a/src/backend/access/gist/gistxlog.c +++ b/src/backend/access/gist/gistxlog.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gist/gistxlog.c,v 1.25 2007/01/05 22:19:22 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/gist/gistxlog.c,v 1.26 2007/02/01 19:10:25 momjian Exp $ *------------------------------------------------------------------------- */ #include "postgres.h" @@ -687,7 +687,7 @@ gistContinueInsert(gistIncompleteInsert *insert) } if (ntodelete == 0) - elog(PANIC, "gistContinueInsert: can't find pointer to page(s)"); + elog(PANIC, "gistContinueInsert: cannot find pointer to page(s)"); /* * we check space with subtraction only first tuple to delete, diff --git a/src/backend/access/hash/hashscan.c b/src/backend/access/hash/hashscan.c index f7d0bb00043..3230c65008e 100644 --- a/src/backend/access/hash/hashscan.c +++ b/src/backend/access/hash/hashscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/hash/hashscan.c,v 1.41 2007/01/05 22:19:22 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/hash/hashscan.c,v 1.42 2007/02/01 19:10:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -99,7 +99,7 @@ _hash_dropscan(IndexScanDesc scan) last = chk; if (chk == NULL) - elog(ERROR, "hash scan list trashed; can't find 0x%p", (void *) scan); + elog(ERROR, "hash scan list trashed; cannot find 0x%p", (void *) scan); if (last == NULL) HashScans = chk->hashsl_next; diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c index b39f283acc8..5dce2083088 100644 --- a/src/backend/access/nbtree/nbtxlog.c +++ b/src/backend/access/nbtree/nbtxlog.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtxlog.c,v 1.40 2007/01/05 22:19:23 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtxlog.c,v 1.41 2007/02/01 19:10:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -142,7 +142,7 @@ _bt_restore_page(Page page, char *from, int len) itemsz = MAXALIGN(itemsz); if (PageAddItem(page, (Item) from, itemsz, FirstOffsetNumber, LP_USED) == InvalidOffsetNumber) - elog(PANIC, "_bt_restore_page: can't add item to page"); + elog(PANIC, "_bt_restore_page: cannot add item to page"); from += itemsz; } } diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index e42d6a8ae6a..4ee1cc711cd 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.231 2007/01/05 22:19:23 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.232 2007/02/01 19:10:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -2582,7 +2582,7 @@ RequireTransactionChain(void *stmtNode, const char *stmtType) ereport(ERROR, (errcode(ERRCODE_NO_ACTIVE_SQL_TRANSACTION), /* translator: %s represents an SQL statement name */ - errmsg("%s may only be used in transaction blocks", + errmsg("%s can only be used in transaction blocks", stmtType))); } diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 53a464694cf..62fbab8d950 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.260 2007/01/05 22:19:23 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.261 2007/02/01 19:10:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -4670,8 +4670,8 @@ StartupXLOG(void) ereport(LOG, (errmsg("database system was interrupted while in recovery at log time %s", str_time(ControlFile->checkPointCopy.time)), - errhint("If this has occurred more than once some data may be corrupted" - " and you may need to choose an earlier recovery target."))); + errhint("If this has occurred more than once some data might be corrupted" + " and you might need to choose an earlier recovery target."))); else if (ControlFile->state == DB_IN_PRODUCTION) ereport(LOG, (errmsg("database system was interrupted; last known up at %s", |