diff options
author | monty@mysql.com <> | 2005-05-26 23:33:20 +0300 |
---|---|---|
committer | monty@mysql.com <> | 2005-05-26 23:33:20 +0300 |
commit | f8cb00640f06230f0d8f200a04ccd91d02bb8bd3 (patch) | |
tree | 4a50a079435cbbf8e998c50bc2a7f1aab35e4c58 /mysql-test/r/union.result | |
parent | 90f971ae2c17889ba89ccb5af017bd210a904428 (diff) | |
download | mariadb-git-f8cb00640f06230f0d8f200a04ccd91d02bb8bd3.tar.gz |
Fix broken test case (after merge)
Diffstat (limited to 'mysql-test/r/union.result')
-rw-r--r-- | mysql-test/r/union.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result index 22417136f67..daa0a428577 100644 --- a/mysql-test/r/union.result +++ b/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; |