diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2022-09-09 16:05:13 +1000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-09-09 06:34:14 +0000 |
| commit | 45a16968d4940c7865e1a3e6d3e2b726f3a03336 (patch) | |
| tree | 91a9b59e025dc465fa464aefeaebf7229394d727 | |
| parent | 08344712d5b08a44f45694b5e6257097db0d74c5 (diff) | |
| download | mongo-45a16968d4940c7865e1a3e6d3e2b726f3a03336.tar.gz | |
Import wiredtiger: 30c7dcaef3d9593e1985eed2132c39d0d4f1b66a from branch mongodb-6.1
ref: 987bc122e7..30c7dcaef3
for: 6.1.0-rc2
WT-9841 Fix tracking of live_open variable, so it works both in diagnostic and non-diagnostic mode (#8252)
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/block/block_ckpt.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index e014839e84e..d7017d90b1e 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-6.1", - "commit": "987bc122e766ff2147e512b05e42a8434ccf1924" + "commit": "30c7dcaef3d9593e1985eed2132c39d0d4f1b66a" } diff --git a/src/third_party/wiredtiger/src/block/block_ckpt.c b/src/third_party/wiredtiger/src/block/block_ckpt.c index 90452b1245e..08633e175c1 100644 --- a/src/third_party/wiredtiger/src/block/block_ckpt.c +++ b/src/third_party/wiredtiger/src/block/block_ckpt.c @@ -159,9 +159,7 @@ __wt_block_checkpoint_unload(WT_SESSION_IMPL *session, WT_BLOCK *block, bool che __wt_spin_lock(session, &block->live_lock); __wt_block_ckpt_destroy(session, &block->live); -#ifdef HAVE_DIAGNOSTIC block->live_open = false; -#endif __wt_spin_unlock(session, &block->live_lock); } |