diff options
| author | Matt Kangas <matt.kangas@mongodb.com> | 2015-01-06 08:58:01 -0500 |
|---|---|---|
| committer | Matt Kangas <matt.kangas@mongodb.com> | 2015-01-06 08:58:01 -0500 |
| commit | f9bdad71e16409017df02058d2579cf659ef2e44 (patch) | |
| tree | bea79aa5d70bcdb81b1a0be6d7fefdbe249552ef /src/third_party/wiredtiger/src/btree/bt_slvg.c | |
| parent | 3ec53687da4702d348f1b55eda5e01bd26f36c4b (diff) | |
| download | mongo-f9bdad71e16409017df02058d2579cf659ef2e44.tar.gz | |
Import wiredtiger-wiredtiger-2.5.0-36-g94ac478.tar.gz from wiredtiger branch mongodb-2.8
Diffstat (limited to 'src/third_party/wiredtiger/src/btree/bt_slvg.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/btree/bt_slvg.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/third_party/wiredtiger/src/btree/bt_slvg.c b/src/third_party/wiredtiger/src/btree/bt_slvg.c index 9d98d0db739..fbc3890f23b 100644 --- a/src/third_party/wiredtiger/src/btree/bt_slvg.c +++ b/src/third_party/wiredtiger/src/btree/bt_slvg.c @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2014-2015 MongoDB, Inc. * Copyright (c) 2008-2014 WiredTiger, Inc. * All rights reserved. * @@ -341,8 +342,8 @@ err: WT_TRET(bm->salvage_end(bm, session)); WT_TRET(__slvg_cleanup(session, ss)); /* Discard temporary buffers. */ - __wt_scr_free(&ss->tmp1); - __wt_scr_free(&ss->tmp2); + __wt_scr_free(session, &ss->tmp1); + __wt_scr_free(session, &ss->tmp2); /* Wrap up reporting. */ WT_TRET(__wt_progress(session, NULL, ss->fcnt)); @@ -471,8 +472,8 @@ __slvg_read(WT_SESSION_IMPL *session, WT_STUFF *ss) } } -err: __wt_scr_free(&as); - __wt_scr_free(&buf); +err: __wt_scr_free(session, &as); + __wt_scr_free(session, &buf); return (ret); } @@ -1785,8 +1786,8 @@ __slvg_row_trk_update_start( err: if (page != NULL) __wt_page_out(session, &page); - __wt_scr_free(&dsk); - __wt_scr_free(&key); + __wt_scr_free(session, &dsk); + __wt_scr_free(session, &key); return (ret); } @@ -2023,7 +2024,7 @@ __slvg_row_build_leaf( if (0) { err: WT_TRET(__wt_page_release(session, ref, 0)); } - __wt_scr_free(&key); + __wt_scr_free(session, &key); return (ret); } |