diff options
| author | Matt Kangas <matt.kangas@mongodb.com> | 2014-12-12 10:56:37 -0500 |
|---|---|---|
| committer | Matt Kangas <matt.kangas@mongodb.com> | 2014-12-12 10:56:37 -0500 |
| commit | d3877ceca348713dc4d4347249a3976ee466edd3 (patch) | |
| tree | a3ebc6344fc7fc8332f4da12057208660bd96d9d /src/third_party/wiredtiger/src/meta | |
| parent | 6b6471ea34f384e747eeef83dfdfcaee1b332bd0 (diff) | |
| download | mongo-d3877ceca348713dc4d4347249a3976ee466edd3.tar.gz | |
Import wiredtiger-wiredtiger-2.8-rc2-171-g378f727.tar.gz from wiredtiger branch mongodb-2.8
Diffstat (limited to 'src/third_party/wiredtiger/src/meta')
| -rw-r--r-- | src/third_party/wiredtiger/src/meta/meta_table.c | 7 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/meta/meta_track.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/third_party/wiredtiger/src/meta/meta_table.c b/src/third_party/wiredtiger/src/meta/meta_table.c index d1e0b2f4bfe..0f2d37a2e55 100644 --- a/src/third_party/wiredtiger/src/meta/meta_table.c +++ b/src/third_party/wiredtiger/src/meta/meta_table.c @@ -68,12 +68,11 @@ __wt_metadata_cursor( /* * We use the metadata a lot, so we have a handle cached; lock it and - * increment the in-use counter. + * increment the in-use counter once the cursor is open. */ WT_ERR(__wt_session_lock_dhandle(session, 0)); - __wt_session_dhandle_incr_use(session); - - ret = __wt_curfile_create(session, NULL, cfg, 0, 0, cursorp); + WT_ERR(__wt_curfile_create(session, NULL, cfg, 0, 0, cursorp)); + __wt_cursor_dhandle_incr_use(session); /* Restore the caller's btree. */ err: session->dhandle = saved_dhandle; diff --git a/src/third_party/wiredtiger/src/meta/meta_track.c b/src/third_party/wiredtiger/src/meta/meta_track.c index 78455f90ab9..a240ee76cb8 100644 --- a/src/third_party/wiredtiger/src/meta/meta_track.c +++ b/src/third_party/wiredtiger/src/meta/meta_track.c @@ -221,7 +221,7 @@ __wt_meta_track_off(WT_SESSION_IMPL *session, int unroll) * durability, checkpoint the metadata. */ if (!unroll && ret == 0 && session->metafile != NULL && - !S2C(session)->logging) + !FLD_ISSET(S2C(session)->log_flags, WT_CONN_LOG_ENABLED)) WT_WITH_BTREE(session, session->metafile, ret = __wt_checkpoint(session, NULL)); |