diff options
| author | David Hows <david.hows@mongodb.com> | 2016-06-24 17:05:13 +1000 |
|---|---|---|
| committer | David Hows <david.hows@mongodb.com> | 2016-06-24 17:05:13 +1000 |
| commit | d8fb874fc40989cb9675e56ca80b3b64e6fa2ee3 (patch) | |
| tree | 6f03ed5cde97aedc762215c14d23ee5305998a2b /src/txn/txn_recover.c | |
| parent | fb1663e6fc800be97c0ddc697b6f939dc610e08e (diff) | |
| parent | 1f4aaa4490a82cf947afdabbb9214ee5b1850d13 (diff) | |
| download | mongo-d8fb874fc40989cb9675e56ca80b3b64e6fa2ee3.tar.gz | |
Merge branch 'develop' of github.com:wiredtiger/wiredtiger into mongodb-3.4mongodb-3.3.9mongodb-3.3.10mongodb-3.0.1
Diffstat (limited to 'src/txn/txn_recover.c')
| -rw-r--r-- | src/txn/txn_recover.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/txn/txn_recover.c b/src/txn/txn_recover.c index 1ea4dba1152..bd004e0f837 100644 --- a/src/txn/txn_recover.c +++ b/src/txn/txn_recover.c @@ -424,6 +424,7 @@ __wt_txn_recover(WT_SESSION_IMPL *session) false, WT_SESSION_NO_LOGGING, &session)); r.session = session; + F_SET(conn, WT_CONN_RECOVERING); WT_ERR(__wt_metadata_search(session, WT_METAFILE_URI, &config)); WT_ERR(__recovery_setup_file(&r, WT_METAFILE_URI, config)); WT_ERR(__wt_metadata_cursor_open(session, NULL, &metac)); @@ -566,6 +567,7 @@ err: WT_TRET(__recovery_free(&r)); WT_TRET(__wt_evict_destroy(session)); WT_TRET(session->iface.close(&session->iface, NULL)); + F_CLR(conn, WT_CONN_RECOVERING); return (ret); } |