Merge branch 'develop' into data-handles

Conflicts:
	src/btree/bt_evict.c
	src/btree/bt_handle.c
	src/btree/bt_page.c
	src/btree/rec_evict.c
	src/conn/conn_dhandle.c
	src/cursor/cur_stat.c
	src/include/btree.h
	src/include/btree.i
	src/include/stat.h
	src/lsm/lsm_cursor.c
	src/schema/schema_create.c
	src/txn/txn_ckpt.c

1 files changed, 19 insertions, 3 deletions

diff --git a/src/btree/row_key.c b/src/btree/row_key.c
index 043cbace5ee..1142bffbdcc 100644
--- a/src/btree/row_key.c
+++ b/src/btree/row_key.c
@@ -309,7 +309,7 @@ next:		switch (direction) {
 	/* If still needed, instantiate the key. */
 	key = WT_ROW_KEY_COPY(rip_arg);
 	if (!__wt_off_page(page, key)) {
-		WT_ERR(__wt_row_ikey_alloc(session,
+		WT_ERR(__wt_row_ikey(session,
 		    WT_PAGE_DISK_OFFSET(page, key),
 		    retb->data, retb->size, &ikey));
 
@@ -380,11 +380,27 @@ __wt_row_value(WT_PAGE *page, WT_ROW *rip)
 }
 
 /*
- * __wt_row_ikey_alloc --
+ * __wt_row_ikey_incr --
+ *	Instantiate a key in a WT_IKEY structure and increment the page's
+ * memory footprint.
+ */
+int
+__wt_row_ikey_incr(WT_SESSION_IMPL *session, WT_PAGE *page,
+    uint32_t cell_offset, const void *key, uint32_t size, void *ikeyp)
+{
+	WT_RET(__wt_row_ikey(session, cell_offset, key, size, ikeyp));
+
+	__wt_cache_page_inmem_incr(session, page, sizeof(WT_IKEY) + size);
+
+	return (0);
+}
+
+/*
+ * __wt_row_ikey --
  *	Instantiate a key in a WT_IKEY structure.
  */
 int
-__wt_row_ikey_alloc(WT_SESSION_IMPL *session,
+__wt_row_ikey(WT_SESSION_IMPL *session,
     uint32_t cell_offset, const void *key, uint32_t size, void *ikeyp)
 {
 	WT_IKEY *ikey;