diff options
| author | Andrew Morton <andrew.morton@mongodb.com> | 2023-05-14 21:44:41 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-05-14 22:25:25 +0000 |
| commit | 5f8e991bbe20359c7d824a6fed385fde1dbd289f (patch) | |
| tree | 17962228717da95873f5445a86056dfc250f2562 | |
| parent | fbf7aef0763465f4c645736275feb4ab6e6828e9 (diff) | |
| download | mongo-5f8e991bbe20359c7d824a6fed385fde1dbd289f.tar.gz | |
Import wiredtiger: 745a9334996a60ee8d4ecf7f238325e489ae1e00 from branch mongodb-master
ref: af1fb31f4e..745a933499
for: 7.1.0-rc0
WT-11046 Adjust format keyno if necessary.
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/test/format/ops.c | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index a20b17c06e5..aab01d4d508 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": "af1fb31f4ecfa4d8e267c1856d159e84e70c70b4" + "commit": "745a9334996a60ee8d4ecf7f238325e489ae1e00" } diff --git a/src/third_party/wiredtiger/test/format/ops.c b/src/third_party/wiredtiger/test/format/ops.c index 14fbb787613..92f3d3cf1a0 100644 --- a/src/third_party/wiredtiger/test/format/ops.c +++ b/src/third_party/wiredtiger/test/format/ops.c @@ -1183,8 +1183,15 @@ rollback_retry: * and have both a VLCS and FLCS table. */ if (g.base_mirror != NULL && g.mirror_fix_var && - (tinfo->last == 0 || tinfo->last == max_rows)) + (tinfo->last == 0 || tinfo->last == max_rows)) { tinfo->last = max_rows - 1; + /* + * It is possible that the key number was set to max rows so make sure we + * don't send in poorly set truncate cursor keys. + */ + if (tinfo->keyno > tinfo->last) + tinfo->keyno = tinfo->last; + } } } else { if (TV(BTREE_REVERSE)) { |