diff options
| author | Susan LoVerso <sue@mongodb.com> | 2016-02-04 13:43:08 -0500 |
|---|---|---|
| committer | Susan LoVerso <sue@mongodb.com> | 2016-02-04 13:43:08 -0500 |
| commit | 0c38a5db9d3a854cc85c2d13834dd4400ef669f9 (patch) | |
| tree | 677097f75eb9471c44ec99b02c2a2a7ed1550df6 /src/session | |
| parent | 3bc60a9b2eff6f8e1af1cfc704fbf994d1bd471f (diff) | |
| parent | 6bff4ed03ac73f18719de48b95c2f3c289ea2661 (diff) | |
| download | mongo-0c38a5db9d3a854cc85c2d13834dd4400ef669f9.tar.gz | |
Merge branch 'develop' into wt-2349-readonly
Diffstat (limited to 'src/session')
| -rw-r--r-- | src/session/session_dhandle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/session/session_dhandle.c b/src/session/session_dhandle.c index d89bb8d133c..1ee3342442c 100644 --- a/src/session/session_dhandle.c +++ b/src/session/session_dhandle.c @@ -454,7 +454,7 @@ __session_get_dhandle( * We didn't find a match in the session cache, search the shared * handle list and cache the handle we find. */ - WT_WITH_HANDLE_LIST_LOCK(session, ret, + WT_WITH_HANDLE_LIST_LOCK(session, ret = __session_find_shared_dhandle(session, uri, checkpoint)); if (ret == 0) ret = __session_add_dhandle(session, NULL); @@ -511,7 +511,7 @@ __wt_session_get_btree(WT_SESSION_IMPL *session, WT_RET(__wt_writeunlock(session, dhandle->rwlock)); WT_WITH_SCHEMA_LOCK(session, ret, - WT_WITH_HANDLE_LIST_LOCK(session, ret, + WT_WITH_HANDLE_LIST_LOCK(session, ret = __wt_session_get_btree( session, uri, checkpoint, cfg, flags))); |