From fe3b359b747105a664065ebb3fc30b3b4891c472 Mon Sep 17 00:00:00 2001
From: "bar@mysql.com" <>
Date: Thu, 18 Nov 2004 16:15:48 +0400
Subject: Check that the third UNION part with COLLATE clause resolves
 collation conflict for the first and the second parts pair.

---
 mysql-test/r/union.result | 10 ++++++++++
 mysql-test/t/union.test   |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index 7820cd1d6ff..49a2907f571 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -1110,4 +1110,14 @@ t1	CREATE TABLE `t1` (
   `a` char(1) character set latin1 collate latin1_german1_ci default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
+create table t1 as
+(select a from t2) union
+(select b from t2) union
+(select 'c' collate latin1_german1_ci from t2);
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` char(1) character set latin1 collate latin1_german1_ci default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+drop table t1;
 drop table t2;
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test
index 36027e8c4cb..468a88b83db 100644
--- a/mysql-test/t/union.test
+++ b/mysql-test/t/union.test
@@ -652,5 +652,11 @@ create table t1 as
 (select b collate latin1_german1_ci from t2);
 show create table t1;
 drop table t1;
+create table t1 as
+(select a from t2) union
+(select b from t2) union
+(select 'c' collate latin1_german1_ci from t2);
+show create table t1;
+drop table t1;
 drop table t2;
 
-- 
cgit v1.2.1