diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2019-01-17 14:36:04 +1100 |
|---|---|---|
| committer | Luke Chen <luke.chen@mongodb.com> | 2019-01-17 14:38:49 +1100 |
| commit | f07694654f3733ff664cdb8b48cee37486095c55 (patch) | |
| tree | 594d90dd27d9b7e8c6934313bd9b88d4d5f8d30b /src/third_party/wiredtiger/src/block/block_read.c | |
| parent | a84cdf9178c4d64c556ab49bb15abf4e866e668f (diff) | |
| download | mongo-f07694654f3733ff664cdb8b48cee37486095c55.tar.gz | |
Import wiredtiger: 21838832317b7c38b1a3e929283170515b08bb79 from branch mongodb-4.2
ref: fa402fef19..2183883231
for: 4.1.8
WT-4452 Fix bugs in the salvage test for big endian
WT-4503 Pre-allocating log file takes long time on PPC machine
WT-4524 wt2853_perf failures in valgrind
WT-4525 wt4333_handle_locks failures in valgrind
Diffstat (limited to 'src/third_party/wiredtiger/src/block/block_read.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/block/block_read.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/third_party/wiredtiger/src/block/block_read.c b/src/third_party/wiredtiger/src/block/block_read.c index 83c1ba17d6d..977fb165b84 100644 --- a/src/third_party/wiredtiger/src/block/block_read.c +++ b/src/third_party/wiredtiger/src/block/block_read.c @@ -120,7 +120,7 @@ __wt_bm_corrupt_dump(WT_SESSION_IMPL *session, WT_DECL_RET; size_t chunk, i, nchunks; -#define WT_CORRUPT_FMT "{%" PRIuMAX ", %" PRIu32 ", %" PRIu32 "}" +#define WT_CORRUPT_FMT "{%" PRIuMAX ", %" PRIu32 ", %#" PRIx32 "}" if (buf->size == 0) { __wt_errx(session, WT_CORRUPT_FMT ": empty buffer, no dump available", @@ -226,7 +226,7 @@ __wt_block_read_off(WT_SESSION_IMPL *session, WT_BLOCK *block, uint32_t page_checksum; __wt_verbose(session, WT_VERB_READ, - "off %" PRIuMAX ", size %" PRIu32 ", checksum %" PRIu32, + "off %" PRIuMAX ", size %" PRIu32 ", checksum %#" PRIx32, (uintmax_t)offset, size, checksum); WT_STAT_CONN_INCR(session, block_read); @@ -276,8 +276,8 @@ __wt_block_read_off(WT_SESSION_IMPL *session, WT_BLOCK *block, __wt_errx(session, "%s: read checksum error for %" PRIu32 "B block at " "offset %" PRIuMAX ": calculated block checksum " - "of %" PRIu32 " doesn't match expected checksum " - "of %" PRIu32, + "of %#" PRIx32 " doesn't match expected checksum " + "of %#" PRIx32, block->name, size, (uintmax_t)offset, page_checksum, checksum); } else @@ -285,8 +285,8 @@ __wt_block_read_off(WT_SESSION_IMPL *session, WT_BLOCK *block, __wt_errx(session, "%s: read checksum error for %" PRIu32 "B block at " "offset %" PRIuMAX ": block header checksum " - "of %" PRIu32 " doesn't match expected checksum " - "of %" PRIu32, + "of %#" PRIx32 " doesn't match expected checksum " + "of %#" PRIx32, block->name, size, (uintmax_t)offset, swap.checksum, checksum); |