diff options
| author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2017-06-29 11:38:10 +1000 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2017-06-29 11:40:58 +1000 |
| commit | 690302a49b61d5be3f4dcc285921eb362648055c (patch) | |
| tree | d0bac8380e27a4ed7a38b9c82fc2996af87b2845 /src/third_party/wiredtiger/src/lsm/lsm_cursor.c | |
| parent | a72d5e357fc0e8b31e705cba539762cd79093773 (diff) | |
| download | mongo-690302a49b61d5be3f4dcc285921eb362648055c.tar.gz | |
Import wiredtiger: ff10db881161bbd1bc23e40ac385ff0de18f68ff from branch mongodb-3.6
ref: f59321a372..ff10db8811
for: 3.5.10
WT-1939 Improve error handling in example code
WT-3181 Add support for MongoDB timestamps
WT-3342 Create a new WiredTiger 2.9.2 release
WT-3363 Add test case to detect when drops may be blocked by checkpoints
WT-3373 Access violation due to a bug in internal page splitting
WT-3385 Coverity 1376471: __wt_txn_parse_timestamp() memory overrun
WT-3391 Create a WiredTiger 2.9.3 release.
WT-3392 Coverity analysis complaints
WT-3393 Missing barrier when a WT_UPDATE structure is appended to list.
Also manually update wiredtiger_config.h pre-generated files in MongoDB source tree
Diffstat (limited to 'src/third_party/wiredtiger/src/lsm/lsm_cursor.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/lsm/lsm_cursor.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/src/lsm/lsm_cursor.c b/src/third_party/wiredtiger/src/lsm/lsm_cursor.c index 1d15ed793a2..06dfec725bb 100644 --- a/src/third_party/wiredtiger/src/lsm/lsm_cursor.c +++ b/src/third_party/wiredtiger/src/lsm/lsm_cursor.c @@ -240,7 +240,7 @@ __clsm_enter(WT_CURSOR_LSM *clsm, bool reset, bool update) break; WT_ASSERT(session, !__wt_txn_visible_all( - session, switch_txn)); + session, switch_txn, NULL)); } } } @@ -539,7 +539,7 @@ retry: if (F_ISSET(clsm, WT_CLSM_MERGE)) { clsm->chunks[ngood - 1]->switch_txn = chunk->switch_txn; if (__wt_txn_visible_all( - session, chunk->switch_txn)) + session, chunk->switch_txn, NULL)) break; } } else { @@ -1466,8 +1466,8 @@ __clsm_put(WT_SESSION_IMPL *session, WT_CURSOR_LSM *clsm, for (i = 0, slot = clsm->nchunks - 1; i < clsm->nupdates; i++, slot--) { /* Check if we need to keep updating old chunks. */ - if (i > 0 && - __wt_txn_visible(session, clsm->chunks[slot]->switch_txn)) { + if (i > 0 && __wt_txn_visible( + session, clsm->chunks[slot]->switch_txn, NULL)) { clsm->nupdates = i; break; } |