summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChenhao Qu <chenhao.qu@mongodb.com>2021-11-03 06:18:36 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-11-03 07:03:06 +0000
commit5c0f98376cf6b91ca885f839b4f972bb31ac2da5 (patch)
tree1c702ead526cecd5b453c6bffd60a215aa452d46
parent7bbe05a84e8148ea33882477242efd853d36c305 (diff)
downloadmongo-5c0f98376cf6b91ca885f839b4f972bb31ac2da5.tar.gz
Import wiredtiger: f60abf3e91ab7443a6cb53742f8fa6581352f3b7 from branch mongodb-master
ref: 798793ffa1..f60abf3e91 for: 5.2.0 WT-8331 change format to allow quote characters
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/test/format/config.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 41e7dfdec45..3298c663ba1 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": "798793ffa1a8fb9960edfc782ad4a54b529e311d"
+ "commit": "f60abf3e91ab7443a6cb53742f8fa6581352f3b7"
}
diff --git a/src/third_party/wiredtiger/test/format/config.c b/src/third_party/wiredtiger/test/format/config.c
index 2b6c6756224..e3f302e78e2 100644
--- a/src/third_party/wiredtiger/test/format/config.c
+++ b/src/third_party/wiredtiger/test/format/config.c
@@ -1401,7 +1401,7 @@ config_single(TABLE *table, const char *s, bool explicit)
* configuration option includes JSON characters.
*/
for (t = (const u_char *)s; *t != '\0'; ++t)
- if (!__wt_isalnum(*t) && !__wt_isspace(*t) && strchr("()-.:=[]_,", *t) == NULL)
+ if (!__wt_isalnum(*t) && !__wt_isspace(*t) && strchr("\"'()-.:=[]_,", *t) == NULL)
testutil_die(
EINVAL, "%s: configuration contains unexpected character %#x", progname, (u_int)*t);