diff options
author | Luke Chen <luke.chen@mongodb.com> | 2018-11-26 14:26:36 +1100 |
---|---|---|
committer | Luke Chen <luke.chen@mongodb.com> | 2018-11-26 14:26:36 +1100 |
commit | 406d650b57a00bbc66e616ebbb5b22112a0621aa (patch) | |
tree | c245e765d3c6eadc7b9be82e216557cf2e43159e /src/third_party/wiredtiger/src/include/serial.i | |
parent | da22c83c0e2d4d9b1e014b183a21898443dbc128 (diff) | |
download | mongo-406d650b57a00bbc66e616ebbb5b22112a0621aa.tar.gz |
Import wiredtiger: 74aa2f92a95596196d8ff131cdf015850613c893 from branch mongodb-4.2
ref: a065c83d8d..74aa2f92a9
for: 4.1.6
WT-3756 Adjust pre-allocated file amount downward if we're not using them quickly enough
WT-4381 Reset session statistics as on WT_SESSION::reset()
WT-4394 Reduce Evergreen Ubuntu build variant runtime by splitting up 'make check' tests
WT-4419 big-endian machines incorrectly configure little-endian crc32c support
WT-4427 Make WiredTiger timestamps always on and 8 bytes
WT-4440 Force a copy of the stable timestamp for clarity
Diffstat (limited to 'src/third_party/wiredtiger/src/include/serial.i')
-rw-r--r-- | src/third_party/wiredtiger/src/include/serial.i | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/src/include/serial.i b/src/third_party/wiredtiger/src/include/serial.i index 02f15cdb8af..21966dfab79 100644 --- a/src/third_party/wiredtiger/src/include/serial.i +++ b/src/third_party/wiredtiger/src/include/serial.i @@ -265,7 +265,7 @@ __wt_update_serial(WT_SESSION_IMPL *session, WT_PAGE *page, { WT_DECL_RET; WT_UPDATE *obsolete, *upd; - wt_timestamp_t *obsolete_timestamp; + wt_timestamp_t obsolete_timestamp; size_t size; uint64_t txn; @@ -314,8 +314,7 @@ __wt_update_serial(WT_SESSION_IMPL *session, WT_PAGE *page, * is used as an indicator of there being further updates on this page. */ if ((txn = page->modify->obsolete_check_txn) != WT_TXN_NONE) { - obsolete_timestamp = - WT_TIMESTAMP_NULL(&page->modify->obsolete_check_timestamp); + obsolete_timestamp = page->modify->obsolete_check_timestamp; if (!__wt_txn_visible_all(session, txn, obsolete_timestamp)) { /* Try to move the oldest ID forward and re-check. */ WT_RET(__wt_txn_update_oldest(session, 0)); |