From 63fc15ceeb95e93ff63e5affba871fc8c31978ae Mon Sep 17 00:00:00 2001
From: "bell@laptop.sanja.is.com.ua" <>
Date: Thu, 21 Aug 2003 00:41:08 +0300
Subject: [PATCH] merge

---
 mysql-test/r/subselect.result | 1 +
 mysql-test/t/subselect.test   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index 510ce867100..cf02eda9aba 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -1350,4 +1350,5 @@ INSERT INTO t1 VALUES ('z','?');
 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;
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index 89f9c528237..457b64a5a11 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -907,8 +907,8 @@ drop table t1,t2;
 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;