diff options
| author | Alex Gorrod <alexg@wiredtiger.com> | 2014-12-10 10:33:37 +1100 |
|---|---|---|
| committer | Alex Gorrod <alexg@wiredtiger.com> | 2014-12-10 10:33:37 +1100 |
| commit | 3ff9cabe96257ae240e3a255b3cf72b6da3040cd (patch) | |
| tree | 74d17bc0f7378784f4e3cad7b020df228533a8ed /src/schema | |
| parent | 8eadc747bc02f04665d3f34facdffa2ea41490b3 (diff) | |
| download | mongo-3ff9cabe96257ae240e3a255b3cf72b6da3040cd.tar.gz | |
Fixup result of merge into develop.
Diffstat (limited to 'src/schema')
| -rw-r--r-- | src/schema/schema_drop.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/schema/schema_drop.c b/src/schema/schema_drop.c index a1baf8f27f3..ca09d25a495 100644 --- a/src/schema/schema_drop.c +++ b/src/schema/schema_drop.c @@ -57,7 +57,7 @@ __drop_file( */ static int __drop_colgroup( - WT_SESSION_IMPL *session, const char *uri, const char *cfg[]) + WT_SESSION_IMPL *session, const char *uri, int force, const char *cfg[]) { WT_COLGROUP *colgroup; WT_DECL_RET; @@ -82,7 +82,7 @@ __drop_colgroup( */ static int __drop_index( - WT_SESSION_IMPL *session, const char *uri, const char *cfg[]) + WT_SESSION_IMPL *session, const char *uri, int force, const char *cfg[]) { WT_INDEX *idx; WT_DECL_RET; @@ -169,11 +169,11 @@ __wt_schema_drop(WT_SESSION_IMPL *session, const char *uri, const char *cfg[]) WT_CLEAR_BTREE_IN_SESSION(session); if (WT_PREFIX_MATCH(uri, "colgroup:")) - ret = __drop_colgroup(session, uri, cfg); + ret = __drop_colgroup(session, uri, force, cfg); else if (WT_PREFIX_MATCH(uri, "file:")) ret = __drop_file(session, uri, force, cfg); else if (WT_PREFIX_MATCH(uri, "index:")) - ret = __drop_index(session, uri, cfg); + ret = __drop_index(session, uri, force, cfg); else if (WT_PREFIX_MATCH(uri, "lsm:")) ret = __wt_lsm_tree_drop(session, uri, cfg); else if (WT_PREFIX_MATCH(uri, "table:")) |