summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Chen <luke.chen@mongodb.com>2021-06-09 17:18:43 +1000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-06-09 10:23:11 +0000
commitfe4c8e2f67e304e97d1f9c8c7a25a36f42fd2d40 (patch)
treecc2a8e86f83eeaab15c636d601b7c08adf0f09a4
parent46713337424f8d6c1541a5cb004a4364cf94f615 (diff)
downloadmongo-fe4c8e2f67e304e97d1f9c8c7a25a36f42fd2d40.tar.gz
Import wiredtiger: 92379db4f8d93f0c9b6017bd334d0cc52b429902 from branch mongodb-5.0
ref: ede142862e..92379db4f8 for: 5.1.0 WT-7594 Use key_consistent mode on format TS runs
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/test/format/wts.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index b07c90abef9..d806caeb355 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.0",
- "commit": "ede142862ea74ff120d1e3195cf367ea4487a0e4"
+ "commit": "92379db4f8d93f0c9b6017bd334d0cc52b429902"
}
diff --git a/src/third_party/wiredtiger/test/format/wts.c b/src/third_party/wiredtiger/test/format/wts.c
index f95d7903c94..48ea45b1022 100644
--- a/src/third_party/wiredtiger/test/format/wts.c
+++ b/src/third_party/wiredtiger/test/format/wts.c
@@ -358,7 +358,7 @@ create_object(WT_CONNECTION *conn)
CONFIG_APPEND(p, ",assert=(read_timestamp=%s)", g.c_txn_timestamps ? "always" : "never");
if (g.c_assert_write_timestamp)
CONFIG_APPEND(p, ",assert=(write_timestamp=on),write_timestamp_usage=%s",
- g.c_txn_timestamps ? "always" : "never");
+ g.c_txn_timestamps ? "key_consistent" : "never");
/* Configure LSM. */
if (DATASOURCE("lsm")) {