summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Chen <luke.chen@mongodb.com>2021-07-07 18:51:58 +1000
committerLuke Chen <luke.chen@mongodb.com>2021-07-07 18:51:58 +1000
commit54515ebf9605b62ffd229c00d4248bfc45587629 (patch)
tree19711ae77a97e6d6b6a87fdb6ae57fe0e8cb5387
parent8c11a9d7c59a156619ba387be14eb584f979442a (diff)
downloadmongo-54515ebf9605b62ffd229c00d4248bfc45587629.tar.gz
Import wiredtiger: dbe06a6778c676506a2eddfda3e1fd5b69f61c57 from branch mongodb-5.0
ref: a413457372..dbe06a6778 for: 5.0.0-rc8 WT-7721 Update test-format to reopen an existing database with different config
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/test/format/t.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 8a969307b1b..e3eafa7d0ec 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": "a41345737223a2432b548566b516ea5f3bd06131"
+ "commit": "dbe06a6778c676506a2eddfda3e1fd5b69f61c57"
}
diff --git a/src/third_party/wiredtiger/test/format/t.c b/src/third_party/wiredtiger/test/format/t.c
index 4cd239a528a..10f9763fa53 100644
--- a/src/third_party/wiredtiger/test/format/t.c
+++ b/src/third_party/wiredtiger/test/format/t.c
@@ -218,8 +218,6 @@ main(int argc, char *argv[])
* file, used when running checks.
*/
if (g.reopen) {
- if (config != NULL)
- testutil_die(EINVAL, "-c incompatible with -R");
if (access(g.home_config, R_OK) != 0)
testutil_die(ENOENT, "%s", g.home_config);
config = g.home_config;