Commit 55ddbd46 authored by unknown's avatar unknown
Browse files

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/space/pekka/ndb/version/my41
parents 006448b9 8453693a

mysql-test/r/union.result

+10 −0
Original line number Diff line number Diff line
@@ -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;

mysql-test/t/union.test

+6 −0
Original line number Diff line number Diff line
@@ -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;