diff options
Diffstat (limited to 'src/third_party/wiredtiger/src/session/session_dhandle.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/session/session_dhandle.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/third_party/wiredtiger/src/session/session_dhandle.c b/src/third_party/wiredtiger/src/session/session_dhandle.c index dd5094fb480..1ac758c0cee 100644 --- a/src/third_party/wiredtiger/src/session/session_dhandle.c +++ b/src/third_party/wiredtiger/src/session/session_dhandle.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2014-2015 MongoDB, Inc. + * Copyright (c) 2014-2016 MongoDB, Inc. * Copyright (c) 2008-2014 WiredTiger, Inc. * All rights reserved. * @@ -453,8 +453,8 @@ __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 = - __session_find_shared_dhandle(session, uri, checkpoint)); + WT_WITH_HANDLE_LIST_LOCK(session, ret, + ret = __session_find_shared_dhandle(session, uri, checkpoint)); if (ret == 0) ret = __session_add_dhandle(session, NULL); @@ -509,9 +509,9 @@ __wt_session_get_btree(WT_SESSION_IMPL *session, F_CLR(dhandle, WT_DHANDLE_EXCLUSIVE); WT_RET(__wt_writeunlock(session, dhandle->rwlock)); - WT_WITH_SCHEMA_LOCK(session, - WT_WITH_HANDLE_LIST_LOCK(session, ret = - __wt_session_get_btree( + WT_WITH_SCHEMA_LOCK(session, ret, + WT_WITH_HANDLE_LIST_LOCK(session, ret, + ret = __wt_session_get_btree( session, uri, checkpoint, cfg, flags))); return (ret); |