diff options
author | Luke Chen <luke.chen@mongodb.com> | 2020-05-08 19:05:30 +1000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-05-08 09:20:41 +0000 |
commit | bbdf0a11d1c61be0760a829e82799129beac7be0 (patch) | |
tree | 51b94986d3d644651c5136e0ccd7e82c09862190 /src/third_party/wiredtiger/src/txn/txn.c | |
parent | 4e2e19c2c2bcc484627142655c4ba43db86f5afc (diff) | |
download | mongo-bbdf0a11d1c61be0760a829e82799129beac7be0.tar.gz |
Import wiredtiger: 404b4a70af14e7d3aecf7f206380884af5d06786 from branch mongodb-4.4r4.4.0-rc5
ref: 18dfb9e58e..404b4a70af
for: 4.4.0-rc5
WT-6093 Fix and reenable test_random_abort in recovery-stress-test
WT-6097 Let the Python test suite runner allocate tests to buckets for evergreen
WT-6128 Reduce the data size in test_checkpoint04 so it completes quickly
WT-6131 Add a test to verify checkpointing truncation in durable history
WT-6137 Fix calculation of bits versus bytes for incremental bitmap
WT-6138 Turn off non-timestamp testing in schema_abort
WT-6141 Disable checkpoint deletion during backup
WT-6142 Fix the assert with no more than one aborted update in chain
WT-6144 Avoid configures verify_metadata in test/format when running on historic builds
WT-6152 Fix accessing checkpoint durable timestamp including older version
WT-6156 Enable format to select "backup.incremental=log"
Diffstat (limited to 'src/third_party/wiredtiger/src/txn/txn.c')
-rw-r--r-- | src/third_party/wiredtiger/src/txn/txn.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/src/txn/txn.c b/src/third_party/wiredtiger/src/txn/txn.c index 0fdf022bd51..bcde2932ab2 100644 --- a/src/third_party/wiredtiger/src/txn/txn.c +++ b/src/third_party/wiredtiger/src/txn/txn.c @@ -718,8 +718,7 @@ __txn_fixup_prepared_update(WT_SESSION_IMPL *session, WT_TXN_OP *op, WT_CURSOR * upd->next = cbt->ins->upd; else if (cbt->ref->page->modify != NULL && cbt->ref->page->modify->mod_row_update != NULL) upd->next = cbt->ref->page->modify->mod_row_update[cbt->slot]; - WT_ASSERT(session, - upd->next != NULL && upd->next->next == NULL && upd->next->txnid == WT_TXN_ABORTED); + WT_ASSERT(session, upd->next != NULL && upd->next->txnid == WT_TXN_ABORTED); /* Append a tombstone if the stop timestamp exists. */ if (hs_stop_ts != WT_TS_MAX) { |