diff options
| author | David Hows <david.hows@mongodb.com> | 2017-01-23 16:05:51 +1100 |
|---|---|---|
| committer | David Hows <david.hows@mongodb.com> | 2017-01-23 16:06:16 +1100 |
| commit | 48a3cbc17fa902528217287fd075c87efb44aebc (patch) | |
| tree | fff4f814ab9fbd7f3eb4c45684f581a5da1c058c /src/btree/row_modify.c | |
| parent | 8d2324943364286056ae399043f70b8a937de312 (diff) | |
| parent | bf8de9767982da9ae0f1542f3744c8aa8544fb82 (diff) | |
| download | mongo-48a3cbc17fa902528217287fd075c87efb44aebc.tar.gz | |
Merge branch 'develop' into mongodb-3.6mongodb-3.5.3mongodb-3.5.2
Diffstat (limited to 'src/btree/row_modify.c')
| -rw-r--r-- | src/btree/row_modify.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/btree/row_modify.c b/src/btree/row_modify.c index a1c214e5b8b..b1a81ca3d9f 100644 --- a/src/btree/row_modify.c +++ b/src/btree/row_modify.c @@ -85,9 +85,8 @@ __wt_row_modify(WT_SESSION_IMPL *session, WT_CURSOR_BTREE *cbt, if (cbt->compare == 0) { if (cbt->ins == NULL) { /* Allocate an update array as necessary. */ - WT_PAGE_ALLOC_AND_SWAP(session, - page, mod->mod_row_update, - upd_entry, page->pg_row_entries); + WT_PAGE_ALLOC_AND_SWAP(session, page, + mod->mod_row_update, upd_entry, page->entries); /* Set the WT_UPDATE array reference. */ upd_entry = &mod->mod_row_update[cbt->slot]; @@ -147,10 +146,10 @@ __wt_row_modify(WT_SESSION_IMPL *session, WT_CURSOR_BTREE *cbt, * slot. That's hard, so we set a flag. */ WT_PAGE_ALLOC_AND_SWAP(session, page, - mod->mod_row_insert, ins_headp, page->pg_row_entries + 1); + mod->mod_row_insert, ins_headp, page->entries + 1); ins_slot = F_ISSET(cbt, WT_CBT_SEARCH_SMALLEST) ? - page->pg_row_entries: cbt->slot; + page->entries: cbt->slot; ins_headp = &mod->mod_row_insert[ins_slot]; /* Allocate the WT_INSERT_HEAD structure as necessary. */ |