Merge branch 'develop' into dhandle-hash

Conflicts:
	test/suite/test_sweep01.py

1 files changed, 6 insertions, 5 deletions

diff --git a/src/support/stat.c b/src/support/stat.c
index a0a4290c597..265a2673d7c 100644
--- a/src/support/stat.c
+++ b/src/support/stat.c
@@ -30,11 +30,11 @@ __wt_stat_init_dsrc_stats(WT_DSRC_STATS *stats)
 	stats->btree_column_variable.desc =
 	    "btree: column-store variable-size leaf pages";
 	stats->btree_fixed_len.desc = "btree: fixed-record size";
-	stats->btree_maxintlitem.desc =
-	    "btree: maximum internal page item size";
+	stats->btree_maxintlkey.desc = "btree: maximum internal page key size";
 	stats->btree_maxintlpage.desc = "btree: maximum internal page size";
-	stats->btree_maxleafitem.desc = "btree: maximum leaf page item size";
+	stats->btree_maxleafkey.desc = "btree: maximum leaf page key size";
 	stats->btree_maxleafpage.desc = "btree: maximum leaf page size";
+	stats->btree_maxleafvalue.desc = "btree: maximum leaf page value size";
 	stats->btree_maximum_depth.desc = "btree: maximum tree depth";
 	stats->btree_entries.desc = "btree: number of key/value pairs";
 	stats->btree_overflow.desc = "btree: overflow pages";
@@ -154,10 +154,11 @@ __wt_stat_refresh_dsrc_stats(void *stats_arg)
 	stats->btree_column_deleted.v = 0;
 	stats->btree_column_variable.v = 0;
 	stats->btree_fixed_len.v = 0;
-	stats->btree_maxintlitem.v = 0;
+	stats->btree_maxintlkey.v = 0;
 	stats->btree_maxintlpage.v = 0;
-	stats->btree_maxleafitem.v = 0;
+	stats->btree_maxleafkey.v = 0;
 	stats->btree_maxleafpage.v = 0;
+	stats->btree_maxleafvalue.v = 0;
 	stats->btree_maximum_depth.v = 0;
 	stats->btree_entries.v = 0;
 	stats->btree_overflow.v = 0;