summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Pasette <dan@10gen.com>2015-02-03 10:03:21 -0500
committerRamon Fernandez <ramon.fernandez@mongodb.com>2015-02-04 13:47:47 -0500
commitd38b4c11771badfeb047813998f3b83406c6ad87 (patch)
tree5bc36c594199c0606a514a85755b54ae6501d1a7
parent82da5f61063358399bfb05f605d762cc651fb160 (diff)
downloadmongo-d38b4c11771badfeb047813998f3b83406c6ad87.tar.gz
Import wiredtiger-wiredtiger-mongodb-2.8-rc6-74-gdf96add.tar.gz from wiredtiger branch mongodb-2.8
(cherry picked from commit 588770c7575f10cb1321aa616b4cc4d89f502c2f)
-rw-r--r--src/third_party/wiredtiger/src/txn/txn_recover.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/src/txn/txn_recover.c b/src/third_party/wiredtiger/src/txn/txn_recover.c
index 62890db7895..71f5df9dda2 100644
--- a/src/third_party/wiredtiger/src/txn/txn_recover.c
+++ b/src/third_party/wiredtiger/src/txn/txn_recover.c
@@ -47,10 +47,6 @@ __recovery_cursor(WT_SESSION_IMPL *session, WT_RECOVERY *r,
c = NULL;
- /* Track the largest file ID we have seen. */
- if (id > r->max_fileid)
- r->max_fileid = id;
-
/*
* Metadata operations have an id of 0. Match operations based
* on the id and the current pass of recovery for metadata.
@@ -313,6 +309,10 @@ __recovery_setup_file(WT_RECOVERY *r, const char *uri, const char *config)
WT_RET(__wt_config_getones(r->session, config, "id", &cval));
fileid = (uint32_t)cval.val;
+ /* Track the largest file ID we have seen. */
+ if (fileid > r->max_fileid)
+ r->max_fileid = fileid;
+
if (r->nfiles <= fileid) {
WT_RET(__wt_realloc_def(
r->session, &r->file_alloc, fileid + 1, &r->files));