diff options
Diffstat (limited to 'src/third_party')
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/include/txn_inline.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index cee21f07d89..7a3debf5fb7 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-master", - "commit": "cd83c1ce55d4c46bce5a16b56ed84c66ca340da9" + "commit": "6942de44633e8b5acb4b17ae165f58adfc569b0d" } diff --git a/src/third_party/wiredtiger/src/include/txn_inline.h b/src/third_party/wiredtiger/src/include/txn_inline.h index fefc159be58..ce2f47ca5d6 100644 --- a/src/third_party/wiredtiger/src/include/txn_inline.h +++ b/src/third_party/wiredtiger/src/include/txn_inline.h @@ -1194,9 +1194,8 @@ __wt_txn_begin(WT_SESSION_IMPL *session, const char *cfg[]) WT_RET(__wt_session_copy_values(session)); /* - * Stall here if the cache is completely full. We have allocated a transaction ID which - * makes it possible for eviction to decide we're contributing to the problem and return - * WT_ROLLBACK. The WT_SESSION.begin_transaction API can't return rollback, continue on. + * Stall here if the cache is completely full. Eviction check can return rollback, but the + * WT_SESSION.begin_transaction API can't, continue on. */ WT_RET_ERROR_OK(__wt_cache_eviction_check(session, false, true, NULL), WT_ROLLBACK); |