summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlison Felizzi <alison.felizzi@mongodb.com>2021-11-04 05:00:37 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-11-04 05:26:46 +0000
commit997e039348afad8836ecabdfebfbab70709e5c9f (patch)
treea63c10e3a756e56fe31305e31810008d47571670
parent53c896d2387d3ffda9f1027557d45e8e4b83de79 (diff)
downloadmongo-997e039348afad8836ecabdfebfbab70709e5c9f.tar.gz
Import wiredtiger: a3fcb8e8c4c0a1f26d810ef714b3ddf14b035eb9 from branch mongodb-master
ref: 622ec1dfde..a3fcb8e8c4 for: 5.2.0 WT-8337 format direct I/O test fails to turn off backups
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/test/format/config.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 205008b12a5..46376054207 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": "622ec1dfde9f5bdc6bd5bb6865d6c64051cfb878"
+ "commit": "a3fcb8e8c4c0a1f26d810ef714b3ddf14b035eb9"
}
diff --git a/src/third_party/wiredtiger/test/format/config.c b/src/third_party/wiredtiger/test/format/config.c
index e3f302e78e2..66021d15858 100644
--- a/src/third_party/wiredtiger/test/format/config.c
+++ b/src/third_party/wiredtiger/test/format/config.c
@@ -470,7 +470,7 @@ config_backward_compatible_table(TABLE *table, void *arg)
if (TV(flag)) { \
if (config_explicit(table, name)) \
testutil_die(EINVAL, "%s not supported in backward compatibility mode", name); \
- config_single(table, #name "=off", false); \
+ config_single(table, name "=off", false); \
}
BC_CHECK("btree.prefix_len", BTREE_PREFIX_LEN);
}
@@ -487,7 +487,7 @@ config_backward_compatible(void)
if (GV(flag)) { \
if (config_explicit(NULL, name)) \
testutil_die(EINVAL, "%s not supported in backward compatibility mode", name); \
- config_single(NULL, #name "=off", false); \
+ config_single(NULL, name "=off", false); \
}
BC_CHECK("disk.mmap_all", DISK_MMAP_ALL);
@@ -732,7 +732,7 @@ config_directio(void)
config_single(NULL, "disk.direct_io=off", false); \
return; \
} \
- config_single(NULL, #name "=off", false); \
+ config_single(NULL, name "=off", false); \
}
/*