bk commit into 4.1 tree (1.1580)

[sanja]

Below is the list of changes that have just been committed into a local
4.1 repository of bell. When bell 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1580 03/08/21 00:41:08 bell@stripped +2 -0
  merge

  mysql-test/t/subselect.test
    1.83 03/08/21 00:41:03 bell@stripped +2 -2
    error code changed

  mysql-test/r/subselect.result
    1.92 03/08/21 00:41:03 bell@stripped +1 -0
    correct result after merging with fixed Item_in_optimiser::fix_left()

# 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:	bell
# Host:	laptop.sanja.is.com.ua
# Root:	/home/bell/mysql/bk/work-collation-4.1

--- 1.91/mysql-test/r/subselect.result	Wed Aug 20 23:39:14 2003
+++ 1.92/mysql-test/r/subselect.result	Thu Aug 21 00:41:03 2003
@@ -1350,4 +1350,5 @@
 select * from t1 where s1 > (select max(s2) from t1);
 ERROR HY000: Illegal mix of collations (latin1_german1_ci,IMPLICIT) and
(latin1_swedish_ci,IMPLICIT) for operation '>'
 select * from t1 where s1 > any (select max(s2) from t1);
+ERROR HY000: Illegal mix of collations (latin1_german1_ci,IMPLICIT) and
(latin1_swedish_ci,IMPLICIT) for operation '>'
 drop table t1;

--- 1.82/mysql-test/t/subselect.test	Wed Aug 20 23:39:14 2003
+++ 1.83/mysql-test/t/subselect.test	Thu Aug 21 00:41:03 2003
@@ -907,8 +907,8 @@
 CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german1_ci,
                  s2 CHAR(5) COLLATE latin1_swedish_ci);
 INSERT INTO t1 VALUES ('z','?');
--- error 1265
+-- error 1266
 select * from t1 where s1 > (select max(s2) from t1);
--- error 1265
+-- error 1266
 select * from t1 where s1 > any (select max(s2) from t1);
 drop table t1;