Merge mysql.com:/home/psergey/mysql-4.1-opt

into  mysql.com:/home/psergey/mysql-5.0-opt2


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

mysql-test/r/subselect.result

@@ -2914,6 +2914,7 @@ s1
 select * from t1 where NOT(s1 = ALL (select s1/s1 from t1));
 s1
 2
+drop table t1;
 create table t1 (df decimal(5,1));
 insert into t1 values(1.1);
 insert into t1 values(2.2);

mysql-test/t/subselect.test

@@ -1867,6 +1867,8 @@ select * from t1 where NOT(s1+1 = ANY (select s1 from t1));
 
 select * from t1 where (s1 = ALL (select s1/s1 from t1));
 select * from t1 where NOT(s1 = ALL (select s1/s1 from t1));
+drop table t1;
+# End of 4.1 tests
 # End of 4.1 tests
 
 #