Merge mysql.com:/usr/home/bar/mysql-4.1.b15949

into  mysql.com:/usr/home/bar/mysql-5.0


mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item.cc:
  Auto merged

1 files changed, 10 insertions, 1 deletions

diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test
index ce6153d2b78..692f1f509fa 100644
--- a/mysql-test/t/union.test
+++ b/mysql-test/t/union.test
@@ -708,6 +708,15 @@ set @val:=6;
 select concat('value is: ', @val) union select 'some text';
 
 #
+# Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE)
+#
+select concat(_latin1'a', _ascii'b' collate ascii_bin);
+create table t1 (foo varchar(100)) collate ascii_bin;
+insert into t1 (foo) values ("foo");
+select foo from t1 union select 'bar' as foo from dual;
+drop table t1;
+
+#
 # Enum merging test
 #
 CREATE TABLE t1 (
@@ -726,8 +735,8 @@ drop table t2;
 create table t2 select a from t1 union select a from t1;
 show columns from t2;
 drop table t2;
--- error 1267
 create table t2 select a from t1 union select c from t1;
+drop table t2;
 create table t2 select a from t1 union select b from t1;
 show columns from t2;
 drop table t2, t1;