bug #1335 tests followup:

--disable_query_log was not a good idea, Serg says


mysql-test/r/group_by.result:
  bug #1335 tests followup:
  --disable_query_log was not a good idea, Serg says
  tests results updated

mysql-test/r/group_by.result

@@ -597,6 +597,13 @@ count(*)	category
 1	3
 1	4
 drop table t1;
+CREATE TABLE t1 (
+userid int(10) unsigned,
+score smallint(5) unsigned,
+key (score)
+);
+INSERT INTO t1 VALUES (1,1),(2,2),(1,1),(3,3),(3,3),(3,3),(3,3),(3,3);
+SELECT userid,count(*) FROM t1 GROUP BY userid DESC;
 userid	count(*)
 3	5
 2	1
@@ -604,6 +611,13 @@ userid	count(*)
 EXPLAIN SELECT userid,count(*) FROM t1 GROUP BY userid DESC;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	ALL	NULL	NULL	NULL	NULL	8	Using temporary; Using filesort
+DROP TABLE t1;
+CREATE TABLE t1 (
+i int(11) default NULL,
+j int(11) default NULL
+);
+INSERT INTO t1 VALUES (1,2),(2,3),(4,5),(3,5),(1,5),(23,5);
+SELECT i, COUNT(DISTINCT(i)) FROM t1 GROUP BY j ORDER BY NULL;
 i	COUNT(DISTINCT(i))
 1	1
 2	1

mysql-test/t/group_by.test

@@ -427,7 +427,6 @@ drop table t1;
 # Tests for bug #1355: 'Using filesort' is missing in EXPLAIN when ORDER BY
 # NULL is used.
 #
---disable_query_log
 CREATE TABLE t1 (
   userid int(10) unsigned,
   score smallint(5) unsigned,
@@ -438,9 +437,7 @@ INSERT INTO t1 VALUES (1,1),(2,2),(1,1),(3,3),(3,3),(3,3),(3,3),(3,3);
 # and then sort it with filesort (GROUP BY in MySQL 
 # implies sorted order of results)
 SELECT userid,count(*) FROM t1 GROUP BY userid DESC;
---enable_query_log
 EXPLAIN SELECT userid,count(*) FROM t1 GROUP BY userid DESC;
---disable_query_log
 DROP TABLE t1;
 CREATE TABLE t1 (
   i int(11) default NULL,
@@ -448,6 +445,5 @@ CREATE TABLE t1 (
 );
 INSERT INTO t1 VALUES (1,2),(2,3),(4,5),(3,5),(1,5),(23,5);
 SELECT i, COUNT(DISTINCT(i)) FROM t1 GROUP BY j ORDER BY NULL;
---enable_query_log
 explain SELECT i, COUNT(DISTINCT(i)) FROM t1 GROUP BY j ORDER BY NULL;
 DROP TABLE t1;