summaryrefslogtreecommitdiff
path: root/src/btree/col_srch.c
diff options
context:
space:
mode:
authorMichael Cahill <michael.cahill@wiredtiger.com>2012-11-16 18:19:48 +1100
committerMichael Cahill <michael.cahill@wiredtiger.com>2012-11-16 18:19:48 +1100
commitc7258fd32736db32a01981c12625213d0b865310 (patch)
treebb97e79a99644cad2342df69cfd6d9c3fe491e53 /src/btree/col_srch.c
parentd98d02ecc03d6dbc7b342c05d4b3e9953a8af119 (diff)
downloadmongo-c7258fd32736db32a01981c12625213d0b865310.tar.gz
Don't automatically fail inserts if the write generation check fails: compare keys instead.
Diffstat (limited to 'src/btree/col_srch.c')
-rw-r--r--src/btree/col_srch.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/btree/col_srch.c b/src/btree/col_srch.c
index c2fbf80c2e2..ffcca036cab 100644
--- a/src/btree/col_srch.c
+++ b/src/btree/col_srch.c
@@ -117,8 +117,8 @@ __wt_col_search(WT_SESSION_IMPL *session, WT_CURSOR_BTREE *cbt, int is_modify)
* For that reason, don't set the cursor's WT_INSERT_HEAD/WT_INSERT pair
* until we know we have a useful entry.
*/
- if ((ins =
- __col_insert_search(ins_head, cbt->ins_stack, recno)) != NULL)
+ if ((ins = __col_insert_search(
+ ins_head, cbt->ins_stack, cbt->next_stack, recno)) != NULL)
if (recno == WT_INSERT_RECNO(ins)) {
cbt->ins_head = ins_head;
cbt->ins = ins;
@@ -135,8 +135,8 @@ past_end:
* past the end of the table.
*/
cbt->ins_head = WT_COL_APPEND(page);
- if ((cbt->ins =
- __col_insert_search(cbt->ins_head, cbt->ins_stack, recno)) == NULL)
+ if ((cbt->ins = __col_insert_search(
+ cbt->ins_head, cbt->ins_stack, cbt->next_stack, recno)) == NULL)
cbt->compare = -1;
else {
cbt->recno = WT_INSERT_RECNO(cbt->ins);