diff options
| author | Chenhao Qu <chenhao.qu@mongodb.com> | 2022-10-12 13:36:51 +1100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-10-12 03:07:31 +0000 |
| commit | 70350ce85d12255b98db52f6f61b20baba603d98 (patch) | |
| tree | 6514d5024a05a4e6f58f7ffe60f45ace89630fce | |
| parent | 867e134f9714ed1b8e6319b0e0368d635ff52bbc (diff) | |
| download | mongo-70350ce85d12255b98db52f6f61b20baba603d98.tar.gz | |
Import wiredtiger: 13b423c79c0ebed82f170912c91b47958d027538 from branch mongodb-master
ref: 9c1e871200..13b423c79c
for: 6.2.0-rc0
WT-9862 Fix init char with int (#8350)
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/schema/schema_plan.c | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index fb3c2e38bfa..c16c9a6531c 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": "9c1e8712006ae4530f0759f138234edbd38ba4b1" + "commit": "13b423c79c0ebed82f170912c91b47958d027538" } diff --git a/src/third_party/wiredtiger/src/schema/schema_plan.c b/src/third_party/wiredtiger/src/schema/schema_plan.c index 8bc330abac7..a87802f4428 100644 --- a/src/third_party/wiredtiger/src/schema/schema_plan.c +++ b/src/third_party/wiredtiger/src/schema/schema_plan.c @@ -142,7 +142,7 @@ __wt_table_check(WT_SESSION_IMPL *session, WT_TABLE *table) for (i = 0; i < table->nkey_columns; i++) WT_RET(__wt_config_next(&conf, &k, &v)); cg = col = 0; - coltype = 0; + coltype = '\0'; while ((ret = __wt_config_next(&conf, &k, &v)) == 0) { if (__find_next_col(session, table, &k, &cg, &col, &coltype) != 0) WT_RET_MSG(session, EINVAL, "Column '%.*s' in '%s' does not appear in a column group", diff --git a/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c b/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c index 7e0f8b8b03b..1d91524ba56 100644 --- a/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c +++ b/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c @@ -535,7 +535,7 @@ flcs_modify(WT_MODIFY *entries, int nentries, uint8_t oldval) if (oldval == FLCS_NONE) { offset = 0; - digit = 0; + digit = '\0'; } else flcs_decode_value(oldval, &offset, &digit); |