summaryrefslogtreecommitdiff
path: root/mysql-test/t/union.test
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-05-26 23:33:20 +0300
committermonty@mysql.com <>2005-05-26 23:33:20 +0300
commitf8cb00640f06230f0d8f200a04ccd91d02bb8bd3 (patch)
tree4a50a079435cbbf8e998c50bc2a7f1aab35e4c58 /mysql-test/t/union.test
parent90f971ae2c17889ba89ccb5af017bd210a904428 (diff)
downloadmariadb-git-f8cb00640f06230f0d8f200a04ccd91d02bb8bd3.tar.gz
Fix broken test case (after merge)
Diffstat (limited to 'mysql-test/t/union.test')
-rw-r--r--mysql-test/t/union.test4
1 files changed, 2 insertions, 2 deletions
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;