summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Chen <luke.chen@mongodb.com>2022-09-05 13:32:59 +1000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-09-05 04:37:06 +0000
commit2f7eb41c22b2fc6b790e3115882694a7caf9c898 (patch)
tree37f20e474a5d5339b4b27ae239d733dfcb0ca92f
parent22450cd55f88f8d9e9b5f6b31553b7019f6ee892 (diff)
downloadmongo-2f7eb41c22b2fc6b790e3115882694a7caf9c898.tar.gz
Import wiredtiger: c4ff543d29fb4d02ba62f4349652477f46eb7b6f from branch mongodb-6.1
ref: f45ebf82db..c4ff543d29 for: 6.1.0-rc1 WT-9683 Coverity analysis defect 124895: Parse warning (#8226)
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/src/tiered/tiered_handle.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index fbb2c69b28e..1957b30a3d6 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-6.1",
- "commit": "f45ebf82dba6e0d88edccb6c3047a717669b4562"
+ "commit": "c4ff543d29fb4d02ba62f4349652477f46eb7b6f"
}
diff --git a/src/third_party/wiredtiger/src/tiered/tiered_handle.c b/src/third_party/wiredtiger/src/tiered/tiered_handle.c
index 3beeb195a06..5a2aa87844d 100644
--- a/src/third_party/wiredtiger/src/tiered/tiered_handle.c
+++ b/src/third_party/wiredtiger/src/tiered/tiered_handle.c
@@ -327,11 +327,10 @@ __tiered_create_object(WT_SESSION_IMPL *session, WT_TIERED *tiered)
{
WT_DECL_RET;
const char *cfg[4] = {NULL, NULL, NULL, NULL};
- const char *config, *name, *orig_name;
+ const char *config, *name;
config = name = NULL;
- config = name = orig_name = NULL;
- orig_name = tiered->tiers[WT_TIERED_INDEX_LOCAL].name;
+ config = name = NULL;
/*
* Create the name and metadata of the new shared object of the current local object. The data
* structure keeps this id so that we don't have to parse and manipulate strings.