database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fix broken test case (after merge)

Browse Source 
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
This commit is contained in:
unknown
2005-05-26 23:33:20 +03:00
parent c8b88e8e45
commit 6a7dedf259
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/r/union.result
View File

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

4
mysql-test/t/union.test
View File

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