bk commit into 5.0 tree (bar:1.2063)

[bar]

Below is the list of changes that have just been committed into a local
5.0 repository of bar. When bar 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
  1.2063 06/03/06 16:20:15 bar@stripped +3 -0
  Merge mysql.com:/usr/home/bar/mysql-4.1.b15949
  into  mysql.com:/usr/home/bar/mysql-5.0

  sql/item.cc
    1.208 06/03/06 16:19:38 bar@stripped +0 -0
    Auto merged

  mysql-test/t/union.test
    1.94 06/03/06 16:19:38 bar@stripped +0 -0
    Auto merged

  mysql-test/r/union.result
    1.81 06/03/06 16:19:38 bar@stripped +0 -0
    Auto merged

# 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:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.0/RESYNC

--- 1.207/sql/item.cc	2006-02-24 20:34:09 +04:00
+++ 1.208/sql/item.cc	2006-03-06 16:19:38 +04:00
@@ -5978,7 +5978,7 @@
     const char *old_cs, *old_derivation;
     old_cs= collation.collation->name;
     old_derivation= collation.derivation_name();
-    if (collation.aggregate(item->collation))
+    if (collation.aggregate(item->collation, MY_COLL_ALLOW_CONV))
     {
       my_error(ER_CANT_AGGREGATE_2COLLATIONS, MYF(0),
 	       old_cs, old_derivation,

--- 1.80/mysql-test/r/union.result	2005-12-01 01:10:04 +04:00
+++ 1.81/mysql-test/r/union.result	2006-03-06 16:19:38 +04:00
@@ -1185,6 +1185,16 @@
 concat('value is: ', @val)
 value is: 6
 some text
+select concat(_latin1'a', _ascii'b' collate ascii_bin);
+concat(_latin1'a', _ascii'b' collate ascii_bin)
+ab
+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;
+foo
+foo
+bar
+drop table t1;
 CREATE TABLE t1 (
 a ENUM('ä','ö','ü') character set utf8 not null default 'ü',
 b ENUM("one", "two") character set utf8,
@@ -1214,7 +1224,7 @@
 a	varchar(1)	NO			
 drop table t2;
 create table t2 select a from t1 union select c from t1;
-ERROR HY000: Illegal mix of collations (utf8_general_ci,IMPLICIT) and
(latin1_swedish_ci,IMPLICIT) for operation 'UNION'
+drop table t2;
 create table t2 select a from t1 union select b from t1;
 show columns from t2;
 Field	Type	Null	Key	Default	Extra

--- 1.93/mysql-test/t/union.test	2005-12-12 15:42:02 +04:00
+++ 1.94/mysql-test/t/union.test	2006-03-06 16:19:38 +04:00
@@ -708,6 +708,15 @@
 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 @@
 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;