[t:3474], fix up some tests

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

mysql-test/suite/tokudb.hotindex/r/hotindex-del-0.result

@@ -20006,7 +20006,7 @@ delete from s where a=4;
 delete from s where a=3;
 delete from s where a=2;
 delete from s where a=1;
-select count(*) from s;
+select count(*) from s use index();
 count(*)
 0
 select count(*) from s use index(i_a);

mysql-test/suite/tokudb.hotindex/r/hotindex-del-1.result

@@ -20006,7 +20006,7 @@ delete from s where a=4;
 delete from s where a=3;
 delete from s where a=2;
 delete from s where a=1;
-select count(*) from s;
+select count(*) from s use index();
 count(*)
 0
 select count(*) from s use index(i_a);

mysql-test/suite/tokudb.hotindex/r/hotindex-insert-0.result

@@ -20006,7 +20006,7 @@ insert into s values (1000000000,4);
 insert into s values (1000000000,3);
 insert into s values (1000000000,2);
 insert into s values (1000000000,1);
-select count(*) from s;
+select count(*) from s use index();
 count(*)
 110000
 select count(*) from s use index(i_a);

mysql-test/suite/tokudb.hotindex/r/hotindex-insert-1.result

@@ -20006,7 +20006,7 @@ insert into s values (1000000000,4);
 insert into s values (1000000000,3);
 insert into s values (1000000000,2);
 insert into s values (1000000000,1);
-select count(*) from s;
+select count(*) from s use index();
 count(*)
 110000
 select count(*) from s use index(i_a);

mysql-test/suite/tokudb.hotindex/t/hotindex-del-0.test

@@ -34,7 +34,7 @@ while ($a) {
 
 connection default;
 reap;
-select count(*) from s;
+select count(*) from s use index();
 select count(*) from s use index(i_a);
 disconnect conn1;
 

mysql-test/suite/tokudb.hotindex/t/hotindex-del-1.test

@@ -34,7 +34,7 @@ while ($a) {
 
 connection default;
 reap;
-select count(*) from s;
+select count(*) from s use index();
 select count(*) from s use index(i_a);
 disconnect conn1;
 

mysql-test/suite/tokudb.hotindex/t/hotindex-insert-0.test

@@ -34,7 +34,7 @@ while ($b) {
 
 connection default;
 reap;
-select count(*) from s;
+select count(*) from s use index();
 select count(*) from s use index(i_a);
 disconnect conn1;
 

mysql-test/suite/tokudb.hotindex/t/hotindex-insert-1.test

@@ -34,7 +34,7 @@ while ($b) {
 
 connection default;
 reap;
-select count(*) from s;
+select count(*) from s use index();
 select count(*) from s use index(i_a);
 disconnect conn1;