Added histogams for table columns.

1 files changed, 245 insertions, 223 deletions

diff --git a/mysql-test/r/statistics.result b/mysql-test/r/statistics.result
index ba0390f98db..2abff4416c9 100644
--- a/mysql-test/r/statistics.result
+++ b/mysql-test/r/statistics.result
@@ -64,13 +64,13 @@ SELECT * FROM mysql.table_stats;
 db_name	table_name	cardinality
 test	t1	40
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t1	PRIMARY	1	1.0000
@@ -87,8 +87,8 @@ COUNT(*)
 40
 SELECT * FROM mysql.column_stats
 WHERE db_name='test' AND table_name='t1' AND column_name='a';
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
 SELECT MIN(t1.a), MAX(t1.a), 
 (SELECT COUNT(*) FROM t1 WHERE t1.b IS NULL) /
 (SELECT COUNT(*) FROM t1) AS "NULLS_RATIO(t1.a)",
@@ -99,8 +99,8 @@ MIN(t1.a)	MAX(t1.a)	NULLS_RATIO(t1.a)	AVG_FREQUENCY(t1.a)
 0	49	0.2000	1.0000
 SELECT * FROM mysql.column_stats
 WHERE db_name='test' AND table_name='t1' AND column_name='b';
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000	0	NULL
 SELECT MIN(t1.b), MAX(t1.b), 
 (SELECT COUNT(*) FROM t1 WHERE t1.b IS NULL) /
 (SELECT COUNT(*) FROM t1) AS "NULLS_RATIO(t1.b)",
@@ -111,8 +111,8 @@ MIN(t1.b)	MAX(t1.b)	NULLS_RATIO(t1.b)	AVG_FREQUENCY(t1.b)
 vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	6.4000
 SELECT * FROM mysql.column_stats 
 WHERE db_name='test' AND table_name='t1' AND column_name='c';
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
 SELECT MIN(t1.c), MAX(t1.c), 
 (SELECT COUNT(*) FROM t1 WHERE t1.c IS NULL) /
 (SELECT COUNT(*) FROM t1) AS "NULLS_RATIO(t1.c)",
@@ -123,8 +123,8 @@ MIN(t1.c)	MAX(t1.c)	NULLS_RATIO(t1.c)	AVG_FREQUENCY(t1.c)
 aaaa	dddddddd	0.1250	7.0000
 SELECT * FROM mysql.column_stats
 WHERE db_name='test' AND table_name='t1' AND column_name='d';
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
 SELECT MIN(t1.d), MAX(t1.d), 
 (SELECT COUNT(*) FROM t1 WHERE t1.d IS NULL) /
 (SELECT COUNT(*) FROM t1) AS "NULLS_RATIO(t1.d)",
@@ -135,8 +135,8 @@ MIN(t1.d)	MAX(t1.d)	NULLS_RATIO(t1.d)	AVG_FREQUENCY(t1.d)
 1989-03-12	1999-07-23	0.1500	8.5000
 SELECT * FROM mysql.column_stats
 WHERE db_name='test' AND table_name='t1' AND column_name='e';
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
 SELECT MIN(t1.e), MAX(t1.e), 
 (SELECT COUNT(*) FROM t1 WHERE t1.e IS NULL) /
 (SELECT COUNT(*) FROM t1) AS "NULLS_RATIO(t1.e)",
@@ -206,6 +206,28 @@ WHERE t1.e IS NOT NULL AND t1.b IS NOT NULL AND t1.d IS NOT NULL)
 AS 'ARITY 3';
 ARITY 1	ARITY 2	ARITY 3
 6.2000	1.6875	1.1304
+DELETE FROM mysql.column_stats;
+set histogram_size=4;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Table is already up to date
+SELECT db_name, table_name, column_name,
+min_value, max_value,
+nulls_ratio, avg_frequency,
+hist_size, HEX(histogram)
+FROM mysql.column_stats;
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_frequency	hist_size	HEX(histogram)
+test	t1	a	0	49	0.0000	1.0000	4	2E62A1D0
+test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	6.4000	4	003FBFFF
+test	t1	c	aaaa	dddddddd	0.1250	7.0000	4	0055AAFF
+test	t1	d	1989-03-12	1999-07-23	0.1500	8.5000	4	009393FF
+test	t1	e	0.01	0.112	0.2250	6.2000	4	000564E1
+test	t1	f	1	5	0.2000	6.4000	4	3F7FBFBF
+DELETE FROM mysql.column_stats;
+set histogram_size= 0;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Table is already up to date
 CREATE TABLE t3 (
 a int NOT NULL PRIMARY KEY,
 b varchar(32),
@@ -238,16 +260,16 @@ db_name	table_name	cardinality
 test	t1	40
 test	t3	17
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
-test	t3	a	0	38	0.0000	4.0000	1.0000
-test	t3	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.1765	18.0714	2.8000
-test	t3	c	aaaa	dddddddd	0.1176	6.4000	3.7500
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
+test	t3	a	0	38	0.0000	4.0000	1.0000	0	NULL
+test	t3	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.1765	18.0714	2.8000	0	NULL
+test	t3	c	aaaa	dddddddd	0.1176	6.4000	3.7500	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t1	PRIMARY	1	1.0000
@@ -267,16 +289,16 @@ db_name	table_name	cardinality
 test	s1	40
 test	t3	17
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	s1	a	0	49	0.0000	4.0000	1.0000
-test	s1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000
-test	s1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	s1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	s1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	s1	f	1	5	0.2000	1.0000	6.4000
-test	t3	a	0	38	0.0000	4.0000	1.0000
-test	t3	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.1765	18.0714	2.8000
-test	t3	c	aaaa	dddddddd	0.1176	6.4000	3.7500
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	s1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	s1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000	0	NULL
+test	s1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	s1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	s1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	s1	f	1	5	0.2000	1.0000	6.4000	0	NULL
+test	t3	a	0	38	0.0000	4.0000	1.0000	0	NULL
+test	t3	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.1765	18.0714	2.8000	0	NULL
+test	t3	c	aaaa	dddddddd	0.1176	6.4000	3.7500	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	s1	PRIMARY	1	1.0000
@@ -296,16 +318,16 @@ db_name	table_name	cardinality
 test	t1	40
 test	t3	17
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
-test	t3	a	0	38	0.0000	4.0000	1.0000
-test	t3	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.1765	18.0714	2.8000
-test	t3	c	aaaa	dddddddd	0.1176	6.4000	3.7500
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
+test	t3	a	0	38	0.0000	4.0000	1.0000	0	NULL
+test	t3	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.1765	18.0714	2.8000	0	NULL
+test	t3	c	aaaa	dddddddd	0.1176	6.4000	3.7500	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t1	PRIMARY	1	1.0000
@@ -324,13 +346,13 @@ SELECT * FROM mysql.table_stats;
 db_name	table_name	cardinality
 test	t1	40
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t1	PRIMARY	1	1.0000
@@ -365,13 +387,13 @@ t1	CREATE TABLE `t1` (
   KEY `idx4` (`y`,`x`,`d`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	x	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	y	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	x	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	y	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
 ALTER TABLE t1 CHANGE COLUMN x b varchar(32), 
 CHANGE COLUMN y e double;
 SHOW CREATE TABLE t1;
@@ -390,13 +412,13 @@ t1	CREATE TABLE `t1` (
   KEY `idx4` (`e`,`b`,`d`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
 ALTER TABLE t1 RENAME TO s1, CHANGE COLUMN b x varchar(32);
 SHOW CREATE TABLE s1;
 Table	Create Table
@@ -417,13 +439,13 @@ SELECT * FROM mysql.table_stats;
 db_name	table_name	cardinality
 test	s1	40
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	s1	a	0	49	0.0000	4.0000	1.0000
-test	s1	x	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000
-test	s1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	s1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	s1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	s1	f	1	5	0.2000	1.0000	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	s1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	s1	x	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000	0	NULL
+test	s1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	s1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	s1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	s1	f	1	5	0.2000	1.0000	6.4000	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	s1	PRIMARY	1	1.0000
@@ -455,13 +477,13 @@ SELECT * FROM mysql.table_stats;
 db_name	table_name	cardinality
 test	t1	40
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t1	PRIMARY	1	1.0000
@@ -490,12 +512,12 @@ t1	CREATE TABLE `t1` (
   KEY `idx4` (`e`,`x`,`d`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t1	PRIMARY	1	1.0000
@@ -519,12 +541,12 @@ t1	CREATE TABLE `t1` (
   KEY `idx4` (`e`,`b`,`d`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t1	PRIMARY	1	1.0000
@@ -535,13 +557,13 @@ ANALYZE TABLE t1 PERSISTENT FOR COLUMNS(b) INDEXES(idx1, idx4);
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t1	PRIMARY	1	1.0000
@@ -576,12 +598,12 @@ t1	CREATE TABLE `t1` (
   KEY `idx4` (`e`,`x`,`d`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t1	PRIMARY	1	1.0000
@@ -605,12 +627,12 @@ t1	CREATE TABLE `t1` (
   KEY `idx4` (`e`,`b`,`d`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t1	PRIMARY	1	1.0000
@@ -624,13 +646,13 @@ LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/save_index_stats'
   INTO TABLE mysql.index_stats
 FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"' LINES TERMINATED BY '\n';
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t1	PRIMARY	1	1.0000
@@ -658,12 +680,12 @@ t1	CREATE TABLE `t1` (
   KEY `idx4` (`e`,`d`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t1	PRIMARY	1	1.0000
@@ -721,12 +743,12 @@ t1	CREATE TABLE `t1` (
   KEY `idx4` (`e`,`b`,`d`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t1	PRIMARY	1	1.0000
@@ -735,13 +757,13 @@ ANALYZE TABLE t1 PERSISTENT FOR COLUMNS(b) INDEXES(idx1, idx2, idx4);
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	b	NULL	NULL	1.0000	NULL	NULL
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	b	NULL	NULL	1.0000	NULL	NULL	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t1	PRIMARY	1	1.0000
@@ -758,13 +780,13 @@ ANALYZE TABLE t1 PERSISTENT FOR COLUMNS(b) INDEXES(idx1, idx2, idx4);
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t1	PRIMARY	1	1.0000
@@ -790,12 +812,12 @@ t1	CREATE TABLE `t1` (
   KEY `idx3` (`d`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t1	PRIMARY	1	1.0000
@@ -820,12 +842,12 @@ t1	CREATE TABLE `t1` (
   KEY `idx4` (`e`,`b`,`d`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t1	PRIMARY	1	1.0000
@@ -834,13 +856,13 @@ ANALYZE TABLE t1 PERSISTENT FOR COLUMNS(b) INDEXES(idx1, idx2, idx4);
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t1	PRIMARY	1	1.0000
@@ -862,7 +884,7 @@ SELECT * FROM mysql.table_stats;
 db_name	table_name	cardinality
 test	t1	40
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 ANALYZE TABLE t1 PERSISTENT FOR COLUMNS(c,e,b) INDEXES(idx2,idx4);
@@ -872,10 +894,10 @@ SELECT * FROM mysql.table_stats;
 db_name	table_name	cardinality
 test	t1	40
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t1	idx2	1	7.0000
@@ -912,13 +934,13 @@ SELECT * FROM mysql.table_stats;
 db_name	table_name	cardinality
 test	t1	40
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
-test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
+test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t1	PRIMARY	1	1.0000
@@ -942,19 +964,19 @@ db_name	table_name	cardinality
 test	t1	40
 test	t2	40
 SELECT * FROM mysql.column_stats ORDER BY column_name;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t2	a	0	49	0.0000	4.0000	1.0000
-test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000
-test	t2	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t2	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t2	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t2	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
-test	t2	f	1	5	0.2000	1.0000	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t2	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000	0	NULL
+test	t2	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t2	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t2	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t2	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
+test	t2	f	1	5	0.2000	1.0000	6.4000	0	NULL
 SELECT * FROM mysql.index_stats ORDER BY index_name, prefix_arity, table_name;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t1	PRIMARY	1	1.0000
@@ -986,13 +1008,13 @@ SELECT * FROM mysql.table_stats;
 db_name	table_name	cardinality
 test	t2	40
 SELECT * FROM mysql.column_stats ORDER BY column_name;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t2	a	0	49	0.0000	4.0000	1.0000
-test	t2	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000
-test	t2	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t2	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t2	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t2	f	1	5	0.2000	1.0000	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t2	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t2	b	vvvvvvvvvvvvv	zzzzzzzzzzzzzzzzzz	0.2000	17.1250	6.4000	0	NULL
+test	t2	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t2	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t2	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t2	f	1	5	0.2000	1.0000	6.4000	0	NULL
 SELECT * FROM mysql.index_stats ORDER BY index_name, prefix_arity, table_name;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t2	PRIMARY	1	1.0000
@@ -1122,12 +1144,12 @@ MODIFY COLUMN b text,
 ADD INDEX idx1 (b(4), e), 
 ADD INDEX idx4 (e, b(4), d);
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t2	a	0	49	0.0000	4.0000	1.0000
-test	t2	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t2	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t2	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t2	f	1	5	0.2000	1.0000	6.4000
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t2	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t2	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t2	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t2	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t2	f	1	5	0.2000	1.0000	6.4000	0	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t2	idx3	1	8.5000
@@ -1143,18 +1165,18 @@ ANALYZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t2	a	0	49	0.0000	4.0000	1.0000
-test	t2	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t2	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t2	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t2	f	1	5	0.2000	1.0000	6.4000
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
-test	t1	b	NULL	NULL	0.2000	17.1250	NULL
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t2	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t2	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t2	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t2	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t2	f	1	5	0.2000	1.0000	6.4000	0	NULL
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
+test	t1	b	NULL	NULL	0.2000	17.1250	NULL	NULL	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t2	idx3	1	8.5000
@@ -1187,7 +1209,7 @@ mysql.column_stats	analyze	status	OK
 SELECT * FROM mysql.table_stats;
 db_name	table_name	cardinality
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 set use_stat_tables='never';
@@ -1198,13 +1220,13 @@ SELECT * FROM mysql.table_stats;
 db_name	table_name	cardinality
 test	t1	40
 SELECT * FROM mysql.column_stats;
-db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency
-test	t1	a	0	49	0.0000	4.0000	1.0000
-test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000
-test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000
-test	t1	e	0.01	0.112	0.2250	8.0000	6.2000
-test	t1	f	1	5	0.2000	1.0000	6.4000
-test	t1	b	NULL	NULL	0.2000	17.1250	NULL
+db_name	table_name	column_name	min_value	max_value	nulls_ratio	avg_length	avg_frequency	hist_size	histogram
+test	t1	a	0	49	0.0000	4.0000	1.0000	0	NULL
+test	t1	c	aaaa	dddddddd	0.1250	6.6571	7.0000	0	NULL
+test	t1	d	1989-03-12	1999-07-23	0.1500	3.0000	8.5000	0	NULL
+test	t1	e	0.01	0.112	0.2250	8.0000	6.2000	0	NULL
+test	t1	f	1	5	0.2000	1.0000	6.4000	0	NULL
+test	t1	b	NULL	NULL	0.2000	17.1250	NULL	NULL	NULL
 SELECT * FROM mysql.index_stats;
 db_name	table_name	index_name	prefix_arity	avg_frequency
 test	t1	PRIMARY	1	1.0000