diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2021-11-05 17:03:17 +1100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-11-05 06:33:39 +0000 |
| commit | ee32214f48ea1a5523d6fc2f50e2772007f4cfff (patch) | |
| tree | 0aa64e395970c122a3af2a287fbf084cfb59e032 | |
| parent | f1c62a4c96808ac556dae9d3b9c552f06ebb0881 (diff) | |
| download | mongo-ee32214f48ea1a5523d6fc2f50e2772007f4cfff.tar.gz | |
Import wiredtiger: a1f0032234a091f87f8d35f8f9d477d1250e359d from branch mongodb-master
ref: 4fd26522f6..a1f0032234
for: 5.2.0
WT-8347 Slipup in test_checkpoint modify changes
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/test/checkpoint/workers.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 5543d96e058..0fe09bed752 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": "4fd26522f66d120d19b696657932db8071f78d23" + "commit": "a1f0032234a091f87f8d35f8f9d477d1250e359d" } diff --git a/src/third_party/wiredtiger/test/checkpoint/workers.c b/src/third_party/wiredtiger/test/checkpoint/workers.c index 3c9313c4c99..babc8731b0a 100644 --- a/src/third_party/wiredtiger/test/checkpoint/workers.c +++ b/src/third_party/wiredtiger/test/checkpoint/workers.c @@ -239,6 +239,7 @@ worker_op(WT_CURSOR *cursor, uint64_t keyno, u_int new_val) return (WT_ROLLBACK); return (log_print_err("cursor.modify", ret, 1)); } + return (0); } else if (ret != WT_NOTFOUND) { if (ret == WT_ROLLBACK || ret == WT_PREPARE_CONFLICT) return (WT_ROLLBACK); |