Moved some old test and added a new test to only be run with mysql-test-run --big

Fixed warnings by valgrind for sum_distinct.test
Enable buffered-record-reads after filesort for InnoDB tables with short primary key
Enabled sort-with-data for MyISAM temporary files

1 files changed, 3 insertions, 3 deletions

diff --git a/mysql-test/t/heap.test b/mysql-test/t/heap.test
index c36474bda30..ca4a8beb527 100644
--- a/mysql-test/t/heap.test
+++ b/mysql-test/t/heap.test
@@ -280,14 +280,14 @@ explain select * from t1 where v='a';
 select v,count(*) from t1 group by v limit 10;
 select v,count(t) from t1 group by v limit 10;
 select v,count(c) from t1 group by v limit 10;
-select sql_big_result v,count(t) from t1 group by v limit 10;
-select sql_big_result v,count(c) from t1 group by v limit 10;
+select sql_big_result trim(v),count(t) from t1 group by v limit 10;
+select sql_big_result trim(v),count(c) from t1 group by v limit 10;
 select c,count(*) from t1 group by c limit 10;
 select c,count(t) from t1 group by c limit 10;
 select sql_big_result c,count(t) from t1 group by c limit 10;
 select t,count(*) from t1 group by t limit 10;
 select t,count(t) from t1 group by t limit 10;
-select sql_big_result t,count(t) from t1 group by t limit 10;
+select sql_big_result trim(t),count(t) from t1 group by t limit 10;
 drop table t1;
 
 #