diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2014-03-05 10:09:41 -0500 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2014-03-05 10:09:41 -0500 |
| commit | fa5b1558707a0957a4a98936c644323dd4b47ec0 (patch) | |
| tree | af2469e7d1b57c4c844d6044cb74f2efd23893c5 /src/btree/bt_slvg.c | |
| parent | ede05a447621b1271a78b35a56632ded8dcb4d05 (diff) | |
| parent | e1dd7c6bb1f7c9a5572d45fbb78faf726c8fec35 (diff) | |
| download | mongo-fa5b1558707a0957a4a98936c644323dd4b47ec0.tar.gz | |
Merge branch 'develop' into new-split
Conflicts:
src/btree/bt_evict.c
src/btree/bt_handle.c
src/btree/bt_page.c
src/btree/bt_slvg.c
src/btree/bt_walk.c
src/btree/col_srch.c
src/btree/rec_write.c
src/btree/row_srch.c
src/config/config_def.c
src/include/btree.i
src/include/cache.h
src/include/extern.h
src/include/flags.h
src/include/misc.h
src/include/txn.i
src/include/wiredtiger.in
Diffstat (limited to 'src/btree/bt_slvg.c')
| -rw-r--r-- | src/btree/bt_slvg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/btree/bt_slvg.c b/src/btree/bt_slvg.c index b324d3eef4b..38fdde31a74 100644 --- a/src/btree/bt_slvg.c +++ b/src/btree/bt_slvg.c @@ -1142,7 +1142,7 @@ __slvg_col_build_leaf( WT_CLEAR(*cookie); /* Get the original page, including the full in-memory setup. */ - WT_RET(__wt_page_in(session, parent, ref)); + WT_RET(__wt_page_in(session, parent, ref, 0)); page = ref->page; entriesp = page->type == WT_PAGE_COL_VAR ? @@ -1735,7 +1735,7 @@ __slvg_row_build_leaf(WT_SESSION_IMPL *session, WT_RET(__wt_scr_alloc(session, 0, &key)); /* Get the original page, including the full in-memory setup. */ - WT_ERR(__wt_page_in(session, parent, ref)); + WT_ERR(__wt_page_in(session, parent, ref, 0)); page = ref->page; /* |