refs #6080, crack at fixing 5585.test

git-svn-id: file:///svn/mysql/tests/mysql-test@53637 c7de825b-a66e-492c-adef-691d508d4ae1

mysql-test/suite/tokudb.bugs/r/5585.result

-use test;
 set global tokudb_debug=0;
 drop table if exists t1, t2;
 set local default_storage_engine=innodb;
@@ -235,8 +234,8 @@ t1.file_number,
 (select hits from t2 where t2.file_id = t1.file_id and t2.insert_ts = date(date_sub(now(),interval 1 day))) as d
 from t1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	41529	
-2	DEPENDENT SUBQUERY	t2	ref	PRIMARY,idx2	PRIMARY	11	test.t1.file_id,const	1	Using where
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	NULL;	
+2	DEPENDENT SUBQUERY	t2	ref	PRIMARY,idx2	PRIMARY	11	test.t1.file_id,const	NULL;	Using where
 alter table t2 engine=tokudb;
 explain
 select t1.file_id, 
@@ -244,6 +243,6 @@ t1.file_number,
 (select hits from t2 where t2.file_id = t1.file_id and t2.insert_ts = date(date_sub(now(),interval 1 day))) as d
 from t1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	41529	
-2	DEPENDENT SUBQUERY	t2	ref	PRIMARY,idx2	PRIMARY	11	test.t1.file_id,const	19661	Using where
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	NULL;	
+2	DEPENDENT SUBQUERY	t2	ref	PRIMARY,idx2	PRIMARY	11	test.t1.file_id,const	NULL;	Using where
 drop table if exists t1, t2;

mysql-test/suite/tokudb.bugs/t/5585.test

-use test;
+--source include/have_innodb.inc
+--source include/have_tokudb.inc
 
 set global tokudb_debug=0;
 
@@ -48,6 +49,8 @@ insert into t2 select t2.file_id, t2.country, 5, date_sub(t2.insert_ts,interval
 insert into t2 select t2.file_id, t2.country, 5, date_sub(t2.insert_ts,interval 16 day) from t2;
 
 
+# ignore rows column
+--replace_column 9 NULL;
 explain
 select t1.file_id, 
        t1.file_number, 
@@ -56,6 +59,8 @@ from t1;
 
 alter table t2 engine=tokudb;
 
+# ignore rows column
+--replace_column 9 NULL;
 explain
 select t1.file_id, 
        t1.file_number,