diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2017-10-25 00:22:03 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2017-10-25 00:22:03 +1100 |
| commit | 2ff0f268538b713b457a16eb3e8f731bd2e63028 (patch) | |
| tree | 2b05affc9567a0889c09b9b9b2d76d44b62a808c /src/third_party/wiredtiger/src/block/block_ckpt.c | |
| parent | 979ee612682b77d9cabaafae10787fbb578cd32a (diff) | |
| download | mongo-2ff0f268538b713b457a16eb3e8f731bd2e63028.tar.gz | |
Import wiredtiger: a31e9d415a25561bd36b001f3a6e9b0a6a115236 from branch mongodb-3.6
ref: 4ecdb8f1a3..a31e9d415a
for: 3.6.0
WT-3235 Fix typo in test case to cover more LSM use cases
WT-3257 Need unit test for log recover setting
WT-3585 Add an API to allow read timestamp to round up to oldest
WT-3596 Timestamp documentation incomplete
WT-3598 Open cursor should not to set transaction error on failure
WT-3616 format failed to report a stuck cache
WT-3629 Cache accounting underflow checks and logging
WT-3640 Change bytes-read statistic
WT-3643 Recovery does not run after database opened with recover=error
WT-3667 Timestamp tests that take backups should pass log=(archive=false)
WT-3669 Check for aborted updates during reconciliation
WT-3672 Test format failure with commit timestamp older than oldest
WT-3673 Opening the lookaside table can race with the statistics server
WT-3674 Snapshot isolation failure after update/restore eviction
Diffstat (limited to 'src/third_party/wiredtiger/src/block/block_ckpt.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/block/block_ckpt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/src/block/block_ckpt.c b/src/third_party/wiredtiger/src/block/block_ckpt.c index d744e10539f..64d0283a8a3 100644 --- a/src/third_party/wiredtiger/src/block/block_ckpt.c +++ b/src/third_party/wiredtiger/src/block/block_ckpt.c @@ -53,8 +53,6 @@ __wt_block_checkpoint_load(WT_SESSION_IMPL *session, WT_BLOCK *block, WT_DECL_RET; uint8_t *endp; - ci = NULL; - /* * Sometimes we don't find a root page (we weren't given a checkpoint, * or the checkpoint was empty). In that case we return an empty root @@ -62,6 +60,8 @@ __wt_block_checkpoint_load(WT_SESSION_IMPL *session, WT_BLOCK *block, */ *root_addr_sizep = 0; + ci = NULL; + #ifdef HAVE_VERBOSE if (WT_VERBOSE_ISSET(session, WT_VERB_CHECKPOINT)) { if (addr != NULL) { |