summaryrefslogtreecommitdiff
path: root/src/meta
diff options
context:
space:
mode:
authorKeith Bostic <keith@wiredtiger.com>2012-07-03 12:29:30 +0000
committerKeith Bostic <keith@wiredtiger.com>2012-07-03 12:29:30 +0000
commitca12553cdb5f8ad700dd24a94c412aaf5f9640a6 (patch)
tree10b6dde1b26b05772ae750728a16ada127412376 /src/meta
parent7bf507cb3772b93e2b243d89f1d6e765c31ddf02 (diff)
parent8c43afc2eede6bc4a96bca2d3569a549f6a7b5fd (diff)
downloadmongo-ca12553cdb5f8ad700dd24a94c412aaf5f9640a6.tar.gz
Merge branch 'develop' into backup
Conflicts: src/include/api.h src/txn/txn_ckpt.c
Diffstat (limited to 'src/meta')
-rw-r--r--src/meta/meta_track.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/meta/meta_track.c b/src/meta/meta_track.c
index 03cc8150e1b..f352af2193a 100644
--- a/src/meta/meta_track.c
+++ b/src/meta/meta_track.c
@@ -107,8 +107,6 @@ __meta_track_apply(WT_SESSION_IMPL *session, WT_META_TRACK *trk, int unroll)
session->btree = trk->btree;
if (!unroll)
WT_TRET(__wt_bm_checkpoint_resolve(session));
- /* Release the checkpoint lock */
- __wt_rwunlock(session, session->btree->ckptlock);
session->btree = saved_btree;
break;
case WT_ST_LOCK: /* Handle lock, see above */