Import wiredtiger: bb0ba80f60c45a10ff5bdb587efde5a602db99af from branch mongodb-master

alisonfel · Evergreen Agent · commit a975ae2a8419 · 2021-07-22T06:05:19.000Z
ref: 29a290bfb3..bb0ba80f60
for: 5.1.0

WT-7883       Remove incorrect wt_free statement
diff --git 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": "29a290bfb376d6a7d3da02d12b7b6236c028db07"
+    "commit": "bb0ba80f60c45a10ff5bdb587efde5a602db99af"
 }
diff --git a/src/third_party/wiredtiger/src/tiered/tiered_handle.c b/src/third_party/wiredtiger/src/tiered/tiered_handle.c
@@ -577,7 +577,6 @@ __tiered_open(WT_SESSION_IMPL *session, const char *cfg[])
     if (0) {
 err:
         __wt_free(session, tiered->obj_config);
-        __wt_free(session, tiered->tiers);
         __wt_free(session, metaconf);
     }
     __wt_verbose(session, WT_VERB_TIERED, "TIERED_OPEN: Done ret %d", ret);

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`	`"vendor": "wiredtiger",`
`3`	`3`	`"github": "wiredtiger/wiredtiger.git",`
`4`	`4`	`"branch": "mongodb-master",`
`5`		`- "commit": "29a290bfb376d6a7d3da02d12b7b6236c028db07"`
	`5`	`+ "commit": "bb0ba80f60c45a10ff5bdb587efde5a602db99af"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,6 @@ __tiered_open(WT_SESSION_IMPL session, const char cfg[])`
`577`	`577`	`if (0) {`
`578`	`578`	`err:`
`579`	`579`	`__wt_free(session, tiered->obj_config);`
`580`		`- __wt_free(session, tiered->tiers);`
`581`	`580`	`__wt_free(session, metaconf);`
`582`	`581`	`}`
`583`	`582`	`__wt_verbose(session, WT_VERB_TIERED, "TIERED_OPEN: Done ret %d", ret);`