diff options
| author | unknown <monty@mysql.com> | 2005-05-26 23:33:20 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-05-26 23:33:20 +0300 |
| commit | 6a7dedf25909719fe5a8c2f98f87e18e6461b705 (patch) | |
| tree | 4a50a079435cbbf8e998c50bc2a7f1aab35e4c58 /mysql-test | |
| parent | c8b88e8e45770ecae2233a5f9fb3dd2a32e17148 (diff) | |
| download | mariadb-git-6a7dedf25909719fe5a8c2f98f87e18e6461b705.tar.gz | |
Fix broken test case (after merge)
mysql-test/r/union.result:
Convert back the latin1 characters that where accidently changed during last merge
mysql-test/t/union.test:
Convert back the latin1 characters that where accidently changed during last merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/union.result | 10 | ||||
| -rw-r--r-- | mysql-test/t/union.test | 4 |
2 files changed, 7 insertions, 7 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; diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test index 42cdf54544a..af548074aa9 100644 --- a/mysql-test/t/union.test +++ b/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; |