summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_walk.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index acf1356d5df..4c75cc0019a 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": "0e2a0ee55ec84aeced65e6f8d6fa494c88c69ac3"
+ "commit": "461b911f9e91e24dad5785dad6bb78eabd3a395f"
}
diff --git a/src/third_party/wiredtiger/src/btree/bt_walk.c b/src/third_party/wiredtiger/src/btree/bt_walk.c
index 5edecbb967e..2d0bf1df6da 100644
--- a/src/third_party/wiredtiger/src/btree/bt_walk.c
+++ b/src/third_party/wiredtiger/src/btree/bt_walk.c
@@ -438,7 +438,10 @@ descend:
if (skip)
break;
empty_internal = false;
- } else if (skip_func != NULL) {
+ }
+
+ /* See if our caller wants to skip this page. */
+ if (skip_func != NULL) {
WT_ERR(skip_func(session, ref, func_cookie, &skip));
if (skip)
break;