Fix TokuDB results after merge

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

@@ -88,9 +88,6 @@ analyze table t1;
 explain select a+0 from t1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	NULL	a	2	NULL	4	Using index
-Warnings:
-Warning	1264	Out of range value for column 'a' at row 1
-Warning	1264	Out of range value for column 'a' at row 1
 select a+0 from t1;
 a+0
 0

storage/tokudb/mysql-test/tokudb_bugs/r/db757_part_alter_analyze.result

@@ -30,9 +30,9 @@ t	1	y	1	y	A	5	NULL	NULL	YES	BTREE
 insert into t values (100,1,1),(200,2,1),(300,3,1),(400,4,1),(500,5,1);
 show indexes from t;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
-t	0	PRIMARY	1	id	A	4	NULL	NULL		BTREE		
-t	1	x	1	x	A	1	NULL	NULL	YES	BTREE		
-t	1	y	1	y	A	4	NULL	NULL	YES	BTREE		
+t	0	PRIMARY	1	id	A	9	NULL	NULL		BTREE		
+t	1	x	1	x	A	2	NULL	NULL	YES	BTREE		
+t	1	y	1	y	A	9	NULL	NULL	YES	BTREE		
 alter table t analyze partition p0;
 Table	Op	Msg_type	Msg_text
 test.t	analyze	status	Engine-independent statistics collected