Merge kaamos.(none):/data/src/opt/mysql-5.0-opt

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


mysql-test/r/subselect.result:
  Manual merge.
mysql-test/t/subselect.test:
  Manual merge.

mysql-test/r/subselect.result

@@ -4338,7 +4338,7 @@ GROUP BY a4;
 a4	f3	a6
 1	NULL	NULL
 2	NULL	NULL
-DROP TABLE t1, t2;
+DROP TABLE t1, t2, t3, t4;
 End of 5.0 tests.
 CREATE TABLE t1 (a int, b int);
 INSERT INTO t1 VALUES (2,22),(1,11),(2,22);

mysql-test/t/subselect.test

@@ -3211,7 +3211,7 @@ FROM
   t2, t3, t1 JOIN t2 a1 ON t1.f9 = a1.f4
 GROUP BY a4;
 
-DROP TABLE t1, t2;
+DROP TABLE t1, t2, t3, t4;
 
 --echo End of 5.0 tests.