diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-10-29 16:00:19 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-10-29 16:00:19 +1100 |
| commit | 3f82127c038961b3719b9aeb031eb5a9047457b5 (patch) | |
| tree | 34584862156c6838cb8a1dbd7e542c362618743e /src/schema | |
| parent | 8d7a517cca4e80f360181ff836960361a5046b33 (diff) | |
| parent | b1be2c9a00afb9ec75072300fa8802abfe2e1b8b (diff) | |
| download | mongo-3f82127c038961b3719b9aeb031eb5a9047457b5.tar.gz | |
Merge branch 'develop' into custom-extractors
Conflicts:
src/cursor/cur_table.c
Diffstat (limited to 'src/schema')
| -rw-r--r-- | src/schema/schema_drop.c | 2 | ||||
| -rw-r--r-- | src/schema/schema_rename.c | 2 | ||||
| -rw-r--r-- | src/schema/schema_truncate.c | 2 | ||||
| -rw-r--r-- | src/schema/schema_worker.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/schema/schema_drop.c b/src/schema/schema_drop.c index fd480b4d77d..6df7e6930c9 100644 --- a/src/schema/schema_drop.c +++ b/src/schema/schema_drop.c @@ -28,7 +28,7 @@ __drop_file( return (EINVAL); /* Close all btree handles associated with this file. */ - WT_RET(__wt_conn_dhandle_close_all(session, uri)); + WT_RET(__wt_conn_dhandle_close_all(session, uri, force)); /* Remove the metadata entry (ignore missing items). */ WT_TRET(__wt_metadata_remove(session, uri)); diff --git a/src/schema/schema_rename.c b/src/schema/schema_rename.c index 442c8124cef..46ec6578987 100644 --- a/src/schema/schema_rename.c +++ b/src/schema/schema_rename.c @@ -29,7 +29,7 @@ __rename_file( return (EINVAL); /* Close any btree handles in the file. */ - WT_ERR(__wt_conn_dhandle_close_all(session, uri)); + WT_ERR(__wt_conn_dhandle_close_all(session, uri, 0)); /* * First, check if the file being renamed exists in the system. Doing diff --git a/src/schema/schema_truncate.c b/src/schema/schema_truncate.c index 112535fd705..1da3b103f10 100644 --- a/src/schema/schema_truncate.c +++ b/src/schema/schema_truncate.c @@ -31,7 +31,7 @@ __truncate_file(WT_SESSION_IMPL *session, const char *name) WT_RET(__wt_session_release_btree(session)); /* Close any btree handles in the file. */ - WT_RET(__wt_conn_dhandle_close_all(session, name)); + WT_RET(__wt_conn_dhandle_close_all(session, name, 0)); /* Delete the root address and truncate the file. */ WT_RET(__wt_meta_checkpoint_clear(session, name)); diff --git a/src/schema/schema_worker.c b/src/schema/schema_worker.c index 8bf8d8405a5..8e7ed3925f6 100644 --- a/src/schema/schema_worker.c +++ b/src/schema/schema_worker.c @@ -48,8 +48,8 @@ __wt_schema_worker(WT_SESSION_IMPL *session, * any open file handles, including checkpoints. */ if (FLD_ISSET(open_flags, WT_DHANDLE_EXCLUSIVE)) - WT_ERR( - __wt_conn_dhandle_close_all(session, uri)); + WT_ERR(__wt_conn_dhandle_close_all( + session, uri, 0)); WT_ERR(__wt_session_get_btree_ckpt( session, uri, cfg, open_flags)); |