group_by.result, group_by.test:

  Correction after merge of fix for bug #8614.

mysql-test/r/group_by.result

@@ -721,11 +721,8 @@ SELECT hostname, COUNT(DISTINCT user_id) as no FROM t1
 WHERE hostname LIKE '%aol%'
     GROUP BY hostname;
 hostname	no
-cache-dtc-af05.proxy.aol.com
-DROP TABLE t1;	1
-drop table if exists t1, t2;
-Warnings:
-Note	1051	Unknown table 't2'
+cache-dtc-af05.proxy.aol.com	1
+DROP TABLE t1;
 create table t1 (c1 char(3), c2 char(3));
 create table t2 (c3 char(3), c4 char(3));
 insert into t1 values ('aaa', 'bb1'), ('aaa', 'bb2');
@@ -747,7 +744,6 @@ aaa
 show warnings;
 Level	Code	Message
 drop table t1, t2;
-DROP TABLE t1;
 CREATE TABLE t1 (a  int, b int);
 INSERT INTO t1 VALUES (1,2), (1,3);
 SELECT a, b FROM t1 GROUP BY 'const';

mysql-test/t/group_by.test

@@ -546,7 +546,6 @@ DROP TABLE t1;
 # Bug#11211: Ambiguous column reference in GROUP BY.
 #
 
-drop table if exists t1, t2;
 create table t1 (c1 char(3), c2 char(3));
 create table t2 (c3 char(3), c4 char(3));
 insert into t1 values ('aaa', 'bb1'), ('aaa', 'bb2');