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
6823225a
Commit
6823225a
authored
Mar 06, 2006
by
bar@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/usr/home/bar/mysql-4.1.b15949
into mysql.com:/usr/home/bar/mysql-5.0
parents
7f4b27cf
e019d605
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
3 deletions
+22
-3
mysql-test/r/union.result
mysql-test/r/union.result
+11
-1
mysql-test/t/union.test
mysql-test/t/union.test
+10
-1
sql/item.cc
sql/item.cc
+1
-1
No files found.
mysql-test/r/union.result
View file @
6823225a
...
...
@@ -1185,6 +1185,16 @@ select concat('value is: ', @val) union select 'some text';
concat('value is: ', @val)
value is: 6
some text
select concat(_latin1'a', _ascii'b' collate ascii_bin);
concat(_latin1'a', _ascii'b' collate ascii_bin)
ab
create table t1 (foo varchar(100)) collate ascii_bin;
insert into t1 (foo) values ("foo");
select foo from t1 union select 'bar' as foo from dual;
foo
foo
bar
drop table t1;
CREATE TABLE t1 (
a ENUM('','','') character set utf8 not null default '',
b ENUM("one", "two") character set utf8,
...
...
@@ -1214,7 +1224,7 @@ Field Type Null Key Default Extra
a varchar(1) NO
drop table t2;
create table t2 select a from t1 union select c from t1;
ERROR HY000: Illegal mix of collations (utf8_general_ci,IMPLICIT) and (latin1_swedish_ci,IMPLICIT) for operation 'UNION'
drop table t2;
create table t2 select a from t1 union select b from t1;
show columns from t2;
Field Type Null Key Default Extra
...
...
mysql-test/t/union.test
View file @
6823225a
...
...
@@ -707,6 +707,15 @@ drop table t1;
set
@
val
:=
6
;
select
concat
(
'value is: '
,
@
val
)
union
select
'some text'
;
#
# Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE)
#
select
concat
(
_latin1
'a'
,
_ascii
'b'
collate
ascii_bin
);
create
table
t1
(
foo
varchar
(
100
))
collate
ascii_bin
;
insert
into
t1
(
foo
)
values
(
"foo"
);
select
foo
from
t1
union
select
'bar'
as
foo
from
dual
;
drop
table
t1
;
#
# Enum merging test
#
...
...
@@ -726,8 +735,8 @@ drop table t2;
create
table
t2
select
a
from
t1
union
select
a
from
t1
;
show
columns
from
t2
;
drop
table
t2
;
--
error
1267
create
table
t2
select
a
from
t1
union
select
c
from
t1
;
drop
table
t2
;
create
table
t2
select
a
from
t1
union
select
b
from
t1
;
show
columns
from
t2
;
drop
table
t2
,
t1
;
...
...
sql/item.cc
View file @
6823225a
...
...
@@ -5978,7 +5978,7 @@ bool Item_type_holder::join_types(THD *thd, Item *item)
const
char
*
old_cs
,
*
old_derivation
;
old_cs
=
collation
.
collation
->
name
;
old_derivation
=
collation
.
derivation_name
();
if
(
collation
.
aggregate
(
item
->
collation
))
if
(
collation
.
aggregate
(
item
->
collation
,
MY_COLL_ALLOW_CONV
))
{
my_error
(
ER_CANT_AGGREGATE_2COLLATIONS
,
MYF
(
0
),
old_cs
,
old_derivation
,
...
...
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