diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2018-10-29 13:32:59 +1100 |
|---|---|---|
| committer | Luke Chen <luke.chen@mongodb.com> | 2018-10-29 13:32:59 +1100 |
| commit | b677c2178df719d9b9cf7720c21832311318679e (patch) | |
| tree | 872fc19ff1dbb5fffe3678b5db04defdb98495b7 /src/third_party/wiredtiger/src/include/txn.i | |
| parent | 5096e2813942583fcfb6541e3559ad647b23ee9b (diff) | |
| download | mongo-b677c2178df719d9b9cf7720c21832311318679e.tar.gz | |
Import wiredtiger: 22b1224ee0623db1ed03f6bf5dd681deb1aa8b2e from branch mongodb-4.2
ref: 0b8896b434..22b1224ee0
for: 4.1.5
WT-3898 Keep prepared updates in lookaside until they are read
WT-4387 Fix ordering of referenced shared libraries in workgen
WT-4389 Update wtperf runner script to accept multiple arguments
Diffstat (limited to 'src/third_party/wiredtiger/src/include/txn.i')
| -rw-r--r-- | src/third_party/wiredtiger/src/include/txn.i | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/src/include/txn.i b/src/third_party/wiredtiger/src/include/txn.i index 69a779d17c8..84cd0c27ef6 100644 --- a/src/third_party/wiredtiger/src/include/txn.i +++ b/src/third_party/wiredtiger/src/include/txn.i @@ -550,7 +550,7 @@ __wt_txn_op_commit_page_del(WT_SESSION_IMPL *session, WT_REF *ref) * Publish to ensure we don't let the page be evicted and the updates * discarded before being written. */ - WT_PUBLISH(ref->state, previous_state); + WT_REF_SET_STATE(ref, previous_state); } /* @@ -1339,7 +1339,7 @@ __wt_txn_am_oldest(WT_SESSION_IMPL *session) txn = &session->txn; txn_global = &conn->txn_global; - if (txn->id == WT_TXN_NONE) + if (txn->id == WT_TXN_NONE || F_ISSET(txn, WT_TXN_PREPARE)) return (false); WT_ORDERED_READ(session_cnt, conn->session_cnt); |