summaryrefslogtreecommitdiff
path: root/src/third_party/wiredtiger/src/schema/schema_drop.c
diff options
context:
space:
mode:
authorLuke Chen <luke.chen@mongodb.com>2021-04-23 16:03:45 +1000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-04-23 08:06:28 +0000
commitf3fea9e4057d77316d258e0ed39aea8b8333ded5 (patch)
tree636319d30090ccfacab0e2ba8f1c0bffa77c01e0 /src/third_party/wiredtiger/src/schema/schema_drop.c
parent703d986d655e972bcc71fcccfe80c0f536c2328c (diff)
downloadmongo-f3fea9e4057d77316d258e0ed39aea8b8333ded5.tar.gz
Import wiredtiger: 3227f141a3e94a44570fc479250f8d1a7de28b32 from branch mongodb-5.0
ref: 0c42c59e9a..3227f141a3 for: 5.0.0 WT-6387 Remove unused WT_CURSTD_UPDATE_LOCAL flag WT-7173 Devise object naming scheme for tiered storage WT-7230 CMake build system support for x86 POSIX targets WT-7414 Create a python test to ensure that all tables that are dropped during backup are exists in the backup
Diffstat (limited to 'src/third_party/wiredtiger/src/schema/schema_drop.c')
-rw-r--r--src/third_party/wiredtiger/src/schema/schema_drop.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/src/schema/schema_drop.c b/src/third_party/wiredtiger/src/schema/schema_drop.c
index 9f6ffbb41e8..8c6226b2dec 100644
--- a/src/third_party/wiredtiger/src/schema/schema_drop.c
+++ b/src/third_party/wiredtiger/src/schema/schema_drop.c
@@ -186,9 +186,10 @@ __drop_tiered(WT_SESSION_IMPL *session, const char *uri, const char *cfg[])
tiered = (WT_TIERED *)session->dhandle;
/* Drop the tiers. */
- for (i = 0; i < tiered->ntiers; i++) {
- tier = tiered->tiers[i];
- WT_ERR(__wt_schema_drop(session, tier->name, cfg));
+ for (i = 0; i < WT_TIERED_MAX_TIERS; i++) {
+ tier = tiered->tiers[i].tier;
+ if (tier != NULL)
+ WT_ERR(__wt_schema_drop(session, tier->name, cfg));
}
ret = __wt_metadata_remove(session, uri);