summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/src/docs/backup.dox7
2 files changed, 6 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index a141aa1bfaf..90e256d3015 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": "9e29269e5f937cab0f4561768665e2c74e3d18e1"
+ "commit": "f0d08420249ac9e57679c58450af62b7e4adc455"
}
diff --git a/src/third_party/wiredtiger/src/docs/backup.dox b/src/third_party/wiredtiger/src/docs/backup.dox
index 4341b118a70..2cf28059965 100644
--- a/src/third_party/wiredtiger/src/docs/backup.dox
+++ b/src/third_party/wiredtiger/src/docs/backup.dox
@@ -154,8 +154,11 @@ will be one of \c WT_BACKUP_FILE or \c WT_BACKUP_RANGE. For \c WT_BACKUP_RANGE,
read the block from the source database file indicated by the file offset and
size pair and write the block to the same offset in the
backup database file, replacing the portion of the file represented by
-the offset/size pair. It is not an error for an offset/size pair to extend past
-the current end of the source file, and any missing file data should be ignored.
+the offset/size pair. \warning It is not an error for an offset/size pair to extend past
+the current end of the source file, and any missing file data should be ignored. This is
+because there can be a long time between incremental backups and the file can expand and
+shrink a lot in the meantime.
+
For \c WT_BACKUP_FILE, the user can choose to copy the entire file in
any way they choose, or to use the offset/size pair which will
indicate the expected size WiredTiger knew at the time of the call.