diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-03-25 16:37:32 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-03-25 16:37:32 +1100 |
| commit | 068bd803ba2bb21feae8b7508f69f228b33d07e9 (patch) | |
| tree | f8f386c051202c0c3923fae15c71a6cff376d7cf /src/cursor/cur_bulk.c | |
| parent | 4be1afdf665bf4bd4449910049fcb0c0ccb9286e (diff) | |
| parent | 01d65d9b536e162ae900aa16158eb29d3144528a (diff) | |
| download | mongo-068bd803ba2bb21feae8b7508f69f228b33d07e9.tar.gz | |
Merge branch 'develop' into data-handles
Conflicts:
dist/filelist
src/block/block_mgr.c
src/btree/bt_cell.c
src/btree/bt_curnext.c
src/btree/bt_curprev.c
src/btree/bt_debug.c
src/btree/bt_evict.c
src/btree/bt_handle.c
src/btree/bt_slvg.c
src/btree/bt_stat.c
src/btree/bt_vrfy.c
src/btree/bt_vrfy_dsk.c
src/btree/rec_write.c
src/btree/row_srch.c
src/conn/conn_dhandle.c
src/cursor/cur_file.c
src/cursor/cur_index.c
src/cursor/cur_stat.c
src/include/api.h
src/include/btree.h
src/include/btree.i
src/include/cache.i
src/include/extern.h
src/include/serial.i
src/include/stat.h
src/include/wt_internal.h
src/lsm/lsm_cursor.c
src/lsm/lsm_worker.c
src/meta/meta_track.c
src/schema/schema_drop.c
src/schema/schema_plan.c
src/schema/schema_truncate.c
src/session/session_api.c
src/session/session_dhandle.c
src/txn/txn_ckpt.c
Diffstat (limited to 'src/cursor/cur_bulk.c')
| -rw-r--r-- | src/cursor/cur_bulk.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/cursor/cur_bulk.c b/src/cursor/cur_bulk.c index 753fd7c4f8c..e4766603f7f 100644 --- a/src/cursor/cur_bulk.c +++ b/src/cursor/cur_bulk.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008-2012 WiredTiger, Inc. + * Copyright (c) 2008-2013 WiredTiger, Inc. * All rights reserved. * * See the file LICENSE for redistribution information. @@ -31,8 +31,8 @@ __curbulk_insert(WT_CURSOR *cursor) WT_CURSOR_NEEDKEY(cursor); WT_CURSOR_NEEDVALUE(cursor); WT_ERR(__wt_bulk_insert(cbulk)); -err: API_END(session); +err: API_END(session); return (ret); } @@ -58,8 +58,8 @@ __curbulk_close(WT_CURSOR *cursor) /* The URI is owned by the btree handle. */ cursor->uri = NULL; WT_TRET(__wt_cursor_close(cursor)); - API_END(session); +err: API_END(session); return (ret); } @@ -68,7 +68,7 @@ __curbulk_close(WT_CURSOR *cursor) * Initialize a bulk cursor. */ int -__wt_curbulk_init(WT_CURSOR_BULK *cbulk) +__wt_curbulk_init(WT_CURSOR_BULK *cbulk, int bitmap) { WT_CURSOR *c = &cbulk->cbt.iface; @@ -82,5 +82,9 @@ __wt_curbulk_init(WT_CURSOR_BULK *cbulk) c->insert = __curbulk_insert; c->close = __curbulk_close; + cbulk->bitmap = bitmap; + if (bitmap) + F_SET(c, WT_CURSTD_RAW); + return (__wt_bulk_init(cbulk)); } |