diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2019-07-12 16:51:32 +1000 |
|---|---|---|
| committer | Luke Chen <luke.chen@mongodb.com> | 2019-07-12 16:51:32 +1000 |
| commit | 67b760c562d7f189bad589841b4dcd14acf702d9 (patch) | |
| tree | bd2291d5306357a1093125f19ae01d5c03d9547c /src/third_party/wiredtiger/src/block/block_ckpt.c | |
| parent | 9ae337bd27f7a513df548256400596a6eba4d7a3 (diff) | |
| download | mongo-67b760c562d7f189bad589841b4dcd14acf702d9.tar.gz | |
Import wiredtiger: 3f686382114354b29b1d92b9c4a7dfc870dc5b94 from branch mongodb-4.2
ref: 99e0760cc5..3f68638211
for: 4.3.1
WT-4530 WiredTiger session statistics cursor returns incorrect key on BigEndian systems
WT-4612 Improve test coverage for prepare updates older than the oldest
WT-4791 Coverity: Dereferencing null (cbt->ins)
WT-4842 Enhance lookaside score calculation
WT-4857 Fix a bug in column store where skip list traversal could miss an entry
WT-4889 Dump additional transaction fields
WT-4913 Fix the Windows CRC32 on blocks that aren't 8B aligned and/or multiples of 8B
WT-4916 Clang Format pre-formatting fixes
WT-4926 Fix the WiredTiger static test suite's test for EBUSY failures
WT-4927 Allow updates with timestamps to be evicted to lookaside
WT-4928 Fix clang scan warnings in Jenkins Pull Request testing
Diffstat (limited to 'src/third_party/wiredtiger/src/block/block_ckpt.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/block/block_ckpt.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/third_party/wiredtiger/src/block/block_ckpt.c b/src/third_party/wiredtiger/src/block/block_ckpt.c index a968370c2a5..9b7a42b5b9c 100644 --- a/src/third_party/wiredtiger/src/block/block_ckpt.c +++ b/src/third_party/wiredtiger/src/block/block_ckpt.c @@ -129,7 +129,8 @@ __wt_block_checkpoint_load(WT_SESSION_IMPL *session, WT_BLOCK *block, WT_ERR(__wt_block_truncate(session, block, ci->file_size)); if (0) { -err: /* +err: + /* * Don't call checkpoint-unload: unload does real work including * file truncation. If we fail early enough that the checkpoint * information isn't correct, bad things would happen. The only @@ -357,11 +358,6 @@ __ckpt_verify(WT_SESSION_IMPL *session, WT_CKPT *ckptbase) break; /* FALLTHROUGH */ default: - /* - * Don't convert to WT_ILLEGAL_VALUE, it won't compile - * on some gcc compilers because they don't understand - * FALLTHROUGH as part of a macro. - */ return (__wt_illegal_value(session, ckpt->flags)); } return (0); |