bk commit into 5.0 tree (sergefp:1.2210)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-22 02:41:29+04:00, sergefp@stripped +2 -0
  Merge mysql.com:/home/psergey/mysql-4.1-opt
  into  mysql.com:/home/psergey/mysql-5.0-opt2
  MERGE: 1.1616.2667.8

  mysql-test/r/subselect.result@stripped, 2006-07-22 02:41:27+04:00, sergefp@stripped +0 -0
    Manual merge
    MERGE: 1.67.1.112

  mysql-test/t/subselect.test@stripped, 2006-07-22 02:41:27+04:00, sergefp@stripped +1 -0
    Manual merge
    MERGE: 1.58.1.99

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sergefp
# Host:	pylon.mylan
# Root:	/home/psergey/mysql-5.0-opt2/RESYNC

--- 1.151/mysql-test/r/subselect.result	2006-07-22 02:41:34 +04:00
+++ 1.152/mysql-test/r/subselect.result	2006-07-22 02:41:34 +04:00
@@ -2914,6 +2914,7 @@
 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);

--- 1.123/mysql-test/t/subselect.test	2006-07-22 02:41:34 +04:00
+++ 1.124/mysql-test/t/subselect.test	2006-07-22 02:41:34 +04:00
@@ -1867,6 +1867,8 @@
 
 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
 
 #