Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
ed6b9812
Commit
ed6b9812
authored
May 27, 2005
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents
697cfe7f
f8cb0064
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
mysql-test/r/union.result
mysql-test/r/union.result
+5
-5
mysql-test/t/union.test
mysql-test/t/union.test
+2
-2
No files found.
mysql-test/r/union.result
View file @
ed6b9812
...
@@ -1201,27 +1201,27 @@ concat('value is: ', @val)
...
@@ -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('
','','') character set utf8 not null default '
',
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('
','','') character set utf8 NOT NULL default '
',
`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 ('
', 'one', 'one'), ('', 'two', 'one'), ('
', 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('
','','
') 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('
','','
') 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;
...
...
mysql-test/t/union.test
View file @
ed6b9812
...
@@ -740,12 +740,12 @@ select concat('value is: ', @val) union select 'some text';
...
@@ -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
(
'
'
,
''
,
''
)
character
set
utf8
not
null
default
'
'
,
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
(
'
'
,
'one'
,
'one'
),
(
''
,
'two'
,
'one'
),
(
'
'
,
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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment