diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2015-01-21 15:00:15 -0500 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2015-01-21 15:00:15 -0500 |
| commit | b978f5b78b26427c4a276d62c5bdb479b83a78b8 (patch) | |
| tree | 076af767aa86d7221e583458e8f7a30eae6dd53b | |
| parent | cbd3d5ea7fd00a8d2e452382ad351c8f7bc94c80 (diff) | |
| parent | a80cbb671fcac3d31abd3f38cf547641de9a1776 (diff) | |
| download | mongo-b978f5b78b26427c4a276d62c5bdb479b83a78b8.tar.gz | |
Merge branch 'develop' into mongodb-2.8
| -rw-r--r-- | src/btree/bt_split.c | 5 | ||||
| -rw-r--r-- | test/suite/run.py | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/btree/bt_split.c b/src/btree/bt_split.c index 395ff447035..94c73106d70 100644 --- a/src/btree/bt_split.c +++ b/src/btree/bt_split.c @@ -1253,8 +1253,9 @@ __wt_split_insert(WT_SESSION_IMPL *session, WT_REF *ref, int *splitp) WT_MEMSIZE_TRANSFER(page_decr, right_incr, sizeof(WT_INSERT) + (size_t)i * sizeof(WT_INSERT *) + WT_INSERT_KEY_SIZE(moved_ins)); for (upd = moved_ins->upd; upd != NULL; upd = upd->next) - WT_MEMSIZE_TRANSFER( - page_decr, right_incr, sizeof(WT_UPDATE) + upd->size); + WT_MEMSIZE_TRANSFER(page_decr, right_incr, + sizeof(WT_UPDATE) + + (WT_UPDATE_DELETED_ISSET(upd) ? 0 : upd->size)); /* * Allocation operations completed, move the last insert list item from diff --git a/test/suite/run.py b/test/suite/run.py index 63101518bd9..1cb7309cb53 100644 --- a/test/suite/run.py +++ b/test/suite/run.py @@ -54,8 +54,10 @@ else: sys.exit(False) # Cannot import wiredtiger and supporting utils until we set up paths -sys.path.append(os.path.join(wt_builddir, 'lang', 'python')) -sys.path.append(os.path.join(wt_disttop, 'lang', 'python')) +# We want our local tree in front of any installed versions of WiredTiger. +# Don't change sys.path[0], it's the dir containing the invoked python script. +sys.path.insert(1, os.path.join(wt_builddir, 'lang', 'python')) +sys.path.insert(1, os.path.join(wt_disttop, 'lang', 'python')) # Add all 3rd party directories: some have code in subdirectories for d in os.listdir(wt_3rdpartydir): |