Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into neptunus.(none):/home/msvensson/mysql/mysql-5.0

mysql-test/r/union.result

@@ -1201,27 +1201,27 @@ concat('value is: ', @val)
 value is: 6
 some text
 CREATE TABLE t1 (
-a ENUM('ä','ö','ü') character set utf8 not null default 'ü',
+a ENUM('','','') character set utf8 not null default '',
 b ENUM("one", "two") character set utf8,
 c ENUM("one", "two")
 );
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` enum('ä','ö','ü') character set utf8 NOT NULL default 'ü',
+  `a` enum('','','') character set utf8 NOT NULL default '',
   `b` enum('one','two') character set utf8 default NULL,
   `c` enum('one','two') default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-insert into t1 values ('ä', 'one', 'one'), ('ö', 'two', 'one'), ('ü', NULL, NULL);
+insert into t1 values ('', 'one', 'one'), ('', 'two', 'one'), ('', NULL, NULL);
 create table t2 select NULL union select a from t1;
 show columns from t2;
 Field	Type	Null	Key	Default	Extra
-NULL	enum('ä','ö','ü')	YES		NULL	
+NULL	enum('','','')	YES		NULL	
 drop table t2;
 create table t2 select a from t1 union select NULL;
 show columns from t2;
 Field	Type	Null	Key	Default	Extra
-a	enum('ä','ö','ü')	YES		NULL	
+a	enum('','','')	YES		NULL	
 drop table t2;
 create table t2 select a from t1 union select a from t1;
 show columns from t2;

mysql-test/t/union.test

@@ -740,12 +740,12 @@ select concat('value is: ', @val) union select 'some text';
 # Enum merging test
 #
 CREATE TABLE t1 (
-  a ENUM('ä','ö','ü') character set utf8 not null default 'ü',
+  a ENUM('','','') character set utf8 not null default '',
   b ENUM("one", "two") character set utf8,
   c ENUM("one", "two")
 );
 show create table t1;
-insert into t1 values ('ä', 'one', 'one'), ('ö', 'two', 'one'), ('ü', NULL, NULL);
+insert into t1 values ('', 'one', 'one'), ('', 'two', 'one'), ('', NULL, NULL);
 create table t2 select NULL union select a from t1;
 show columns from t2;
 drop table t2;