MDEV-7907 tokudb.cluster_filter_unpack_varchar_hidden fails sporadica…

…lly in buildbot

Index access becomes range every once in a while. Masked the value in addition
to other already masked columns

storage/tokudb/mysql-test/tokudb/r/cluster_filter_unpack_varchar_hidden.result

@@ -182,14 +182,14 @@ a	b	c	d	e	f
 3	30	200	2000	20000	200000
 explain select * from t1 where b > "0";
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	b	b	NULL	NULL	NULL;	Using where; Using index
+1	SIMPLE	t1	<type>	b	b	NULL	NULL	NULL;	Using where; Using index
 select * from t1 where b > "0";
 a	b	c	d	e	f
 2	20	100	1000	10000	100000
 3	30	200	2000	20000	200000
 explain select * from t1 where d > "0";
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	d	d	NULL	NULL	NULL;	Using where; Using index
+1	SIMPLE	t1	<type>	d	d	NULL	NULL	NULL;	Using where; Using index
 select * from t1 where d > "0";
 a	b	c	d	e	f
 2	20	100	1000	10000	100000

storage/tokudb/mysql-test/tokudb/t/cluster_filter_unpack_varchar_hidden.test

@@ -82,11 +82,11 @@ alter table t1 add key d(d,a) clustering=yes, add key b(b) clustering=yes;
 explain select * from t1;
 select * from t1;
 
---replace_column 7 NULL 9 NULL;
+--replace_column 4 <type> 7 NULL 9 NULL;
 explain select * from t1 where b > "0";
 select * from t1 where b > "0";
 
---replace_column 7 NULL 9 NULL;
+--replace_column 4 <type> 7 NULL 9 NULL;
 explain select * from t1 where d > "0";
 select * from t1 where d > "0";