Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1

into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0


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

mysql-test/r/union.result

@@ -1195,3 +1195,8 @@ a	b
 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

mysql-test/t/union.test

@@ -729,3 +729,9 @@ select * from ((select * from t1 limit 1) union (select * from t1 limit 1) union
 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';