diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-03-20 00:19:23 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-03-20 00:19:23 +1100 |
| commit | 16e5e9316e33caedb7a5e24b95a082169a3c661a (patch) | |
| tree | b557bf8d04d1c9eff6cd62b240d916835f8f7c24 | |
| parent | d0f7ae6ef7813fc7e606c075b5ec7b7670400ea1 (diff) | |
| download | mongo-16e5e9316e33caedb7a5e24b95a082169a3c661a.tar.gz | |
Fix merges in column stores: don't look inside ref->u.key.
| -rw-r--r-- | src/btree/rec_merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/btree/rec_merge.c b/src/btree/rec_merge.c index fd0098be19d..5657a144e94 100644 --- a/src/btree/rec_merge.c +++ b/src/btree/rec_merge.c @@ -178,7 +178,7 @@ __merge_switch_page(WT_PAGE *parent, WT_REF *ref, WT_VISIT_STATE *state) state->session, state->page, parent, sizeof(WT_ADDR) + ((WT_ADDR *)ref->addr)->size); - if (ref->u.key != NULL) + if (parent->type == WT_PAGE_ROW_INT) __merge_transfer_footprint( state->session, state->page, parent, sizeof(WT_IKEY) + ((WT_IKEY *)ref->u.key)->size); |