summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLuke Chen <luke.chen@mongodb.com>2021-12-21 17:27:42 +1100
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-12-21 07:28:22 +0000
commit4eee45a1167346286f9d7ddfd3cd636c2fdcbd1b (patch)
tree375723a815fbf4f4e85a87e323d413fb3c950ef2 /src
parent5d0571597f222fd3a08147813f5c3b3afa63c139 (diff)
downloadmongo-4eee45a1167346286f9d7ddfd3cd636c2fdcbd1b.tar.gz
Import wiredtiger: 33d207d74c7ba955c8b98286072b0922047c7bae from branch mongodb-5.2
ref: 09371221d4..33d207d74c for: 5.2.0-rc2 WT-8549 Don't wipe out timestamps after rts rolls back an update
Diffstat (limited to 'src')
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/src/txn/txn_rollback_to_stable.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index cf938684a12..1fd2ed9154b 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-5.2",
- "commit": "09371221d48aa77fbbb7e8ab654aa858ba29885e"
+ "commit": "33d207d74c7ba955c8b98286072b0922047c7bae"
}
diff --git a/src/third_party/wiredtiger/src/txn/txn_rollback_to_stable.c b/src/third_party/wiredtiger/src/txn/txn_rollback_to_stable.c
index 8e6283b26e1..f216c956ff3 100644
--- a/src/third_party/wiredtiger/src/txn/txn_rollback_to_stable.c
+++ b/src/third_party/wiredtiger/src/txn/txn_rollback_to_stable.c
@@ -101,7 +101,6 @@ __rollback_abort_update(WT_SESSION_IMPL *session, WT_ITEM *key, WT_UPDATE *first
upd->txnid = WT_TXN_ABORTED;
WT_STAT_CONN_INCR(session, txn_rts_upd_aborted);
- upd->durable_ts = upd->start_ts = WT_TS_NONE;
} else {
/* Valid update is found. */
stable_upd = upd;