diff options
Diffstat (limited to 'src/backend/access')
| -rw-r--r-- | src/backend/access/common/indextuple.c | 5 | ||||
| -rw-r--r-- | src/backend/access/heap/hio.c | 9 | ||||
| -rw-r--r-- | src/backend/access/nbtree/nbtinsert.c | 6 | ||||
| -rw-r--r-- | src/backend/access/nbtree/nbtsort.c | 6 | ||||
| -rw-r--r-- | src/backend/access/transam/xlog.c | 3 |
5 files changed, 15 insertions, 14 deletions
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c index b4dc69df269..15ed1824560 100644 --- a/src/backend/access/common/indextuple.c +++ b/src/backend/access/common/indextuple.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.45 2000/09/23 22:40:12 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.46 2000/11/16 05:50:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -139,7 +139,8 @@ index_formtuple(TupleDesc tupleDescriptor, */ if ((size & INDEX_SIZE_MASK) != size) - elog(ERROR, "index_formtuple: data takes %d bytes: too big", size); + elog(ERROR, "index_formtuple: data takes %lu bytes: too big", + (unsigned long)size); infomask |= size; diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c index 04725b4a7b4..43a94c4c1e3 100644 --- a/src/backend/access/heap/hio.c +++ b/src/backend/access/heap/hio.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Id: hio.c,v 1.33 2000/09/07 09:58:35 vadim Exp $ + * $Id: hio.c,v 1.34 2000/11/16 05:50:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -91,8 +91,8 @@ RelationGetBufferForTuple(Relation relation, Size len) * If we're gonna fail for oversize tuple, do it right away */ if (len > MaxTupleSize) - elog(ERROR, "Tuple is too big: size %u, max size %ld", - len, MaxTupleSize); + elog(ERROR, "Tuple is too big: size %lu, max size %ld", + (unsigned long)len, MaxTupleSize); if (!relation->rd_myxactonly) LockPage(relation, 0, ExclusiveLock); @@ -139,7 +139,8 @@ RelationGetBufferForTuple(Relation relation, Size len) if (len > PageGetFreeSpace(pageHeader)) { /* We should not get here given the test at the top */ - elog(STOP, "Tuple is too big: size %u", len); + elog(STOP, "Tuple is too big: size %lu", + (unsigned long)len); } } diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c index 4b92f2f5611..6d287fb79bc 100644 --- a/src/backend/access/nbtree/nbtinsert.c +++ b/src/backend/access/nbtree/nbtinsert.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.67 2000/10/21 15:43:18 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.68 2000/11/16 05:50:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -348,8 +348,8 @@ _bt_insertonpg(Relation rel, * itemsz doesn't include the ItemId. */ if (itemsz > (PageGetPageSize(page) - sizeof(PageHeaderData) - MAXALIGN(sizeof(BTPageOpaqueData))) / 3 - sizeof(ItemIdData)) - elog(ERROR, "btree: index item size %u exceeds maximum %lu", - itemsz, + elog(ERROR, "btree: index item size %lu exceeds maximum %lu", + (unsigned long)itemsz, (PageGetPageSize(page) - sizeof(PageHeaderData) - MAXALIGN(sizeof(BTPageOpaqueData))) /3 - sizeof(ItemIdData)); /* diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c index b52522fa8de..e3e3bc04e90 100644 --- a/src/backend/access/nbtree/nbtsort.c +++ b/src/backend/access/nbtree/nbtsort.c @@ -35,7 +35,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsort.c,v 1.57 2000/08/10 02:33:20 inoue Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsort.c,v 1.58 2000/11/16 05:50:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -346,8 +346,8 @@ _bt_buildadd(Relation index, BTPageState *state, BTItem bti) * during creation of an index, we don't go through there. */ if (btisz > (PageGetPageSize(npage) - sizeof(PageHeaderData) - MAXALIGN(sizeof(BTPageOpaqueData))) / 3 - sizeof(ItemIdData)) - elog(ERROR, "btree: index item size %d exceeds maximum %ld", - btisz, + elog(ERROR, "btree: index item size %lu exceeds maximum %ld", + (unsigned long)btisz, (PageGetPageSize(npage) - sizeof(PageHeaderData) - MAXALIGN(sizeof(BTPageOpaqueData))) /3 - sizeof(ItemIdData)); if (pgspc < btisz || pgspc < state->btps_full) diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 6d7112ceaf1..b85c39cb80e 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.25 2000/11/09 11:25:58 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.26 2000/11/16 05:50:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1274,7 +1274,6 @@ BootStrapXLOG() int fd; char buffer[BLCKSZ]; CheckPoint checkPoint; - bool usexistent = false; #ifdef XLOG XLogPageHeader page = (XLogPageHeader) buffer; |