subselect.test, subselect.result:

  After merge fix.


mysql-test/r/subselect.result:
  After merge fix.
mysql-test/t/subselect.test:
  After merge fix.

mysql-test/r/subselect.result

@@ -3988,6 +3988,7 @@ a	test
 1	n
 2	o
 3	p
+DROP TABLE t1;
 CREATE TABLE t1 (a int, b int);
 INSERT INTO t1 VALUES (2,22),(1,11),(2,22);
 SELECT a FROM t1 WHERE (SELECT COUNT(b) FROM DUAL) > 0 GROUP BY a;

mysql-test/t/subselect.test

@@ -2818,6 +2818,7 @@ SELECT tt.a, MAX(
   FROM t1 WHERE t1.a=tt.a GROUP BY a LIMIT 1)) as test 
   FROM t1 as tt GROUP BY tt.a;
 
+DROP TABLE t1;
 #
 # Bug #27348: SET FUNCTION used in  a subquery from WHERE condition 
 #