bk commit into 4.1 tree (bar:1.2150) BUG#6519

[bar]

Below is the list of changes that have just been committed into a local
4.1 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.2150 05/03/28 14:17:47 bar@stripped +2 -0
  union.test:
    Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
    Prove that this problem was fixed with bug9425 fix too.

  mysql-test/r/union.result
    1.87 05/03/28 14:16:57 bar@stripped +5 -0

  mysql-test/t/union.test
    1.81 05/03/28 14:16:13 bar@stripped +6 -0
    Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
    Prove that this problem was fixed with bug9425 fix too.

# 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-4.1

--- 1.86/mysql-test/r/union.result	2005-02-14 02:35:36 +04:00
+++ 1.87/mysql-test/r/union.result	2005-03-28 14:16:57 +05:00
@@ -1195,3 +1195,8 @@
 2	b
 3	c
 drop table t1;
+set @val:=6;
+select concat('value is: ', @val) union select 'some text';
+concat('value is: ', @val)
+value is: 6
+some text

--- 1.80/mysql-test/t/union.test	2005-02-14 02:35:36 +04:00
+++ 1.81/mysql-test/t/union.test	2005-03-28 14:16:13 +05:00
@@ -711,3 +711,9 @@
 select * from ((((select * from t1))) union (select * from t1) union (select * from t1)) a;
 select * from ((select * from t1) union (((select * from t1))) union (select * from t1)) a;
 drop table t1;
+
+#
+# Bugs#6519 UNION with collation binary and latin1_swedish_ci fails
+#
+set @val:=6;
+select concat('value is: ', @val) union select 'some text';