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
d1b4cee8
Commit
d1b4cee8
authored
Aug 21, 2007
by
gshchepa/uchum@gleb.loc
Browse files
Options
Browse Files
Download
Plain Diff
Merge gleb.loc:/home/uchum/work/bk/5.0
into gleb.loc:/home/uchum/work/bk/5.0-opt
parents
3d44204e
04981779
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
2 deletions
+18
-2
mysql-test/r/ctype_recoding.result
mysql-test/r/ctype_recoding.result
+8
-0
mysql-test/t/ctype_recoding.test
mysql-test/t/ctype_recoding.test
+10
-0
sql/sql_string.cc
sql/sql_string.cc
+0
-2
No files found.
mysql-test/r/ctype_recoding.result
View file @
d1b4cee8
...
@@ -187,6 +187,14 @@ select * from t1 where a=_latin1'
...
@@ -187,6 +187,14 @@ select * from t1 where a=_latin1'
ERROR HY000: Illegal mix of collations (cp1251_general_ci,IMPLICIT) and (latin1_swedish_ci,COERCIBLE) for operation '='
ERROR HY000: Illegal mix of collations (cp1251_general_ci,IMPLICIT) and (latin1_swedish_ci,COERCIBLE) for operation '='
drop table t1;
drop table t1;
set names latin1;
set names latin1;
set names ascii;
create table t1 (a char(1) character set latin1);
insert into t1 values ('a');
select * from t1 where a='a';
a
a
drop table t1;
set names latin1;
create table t1 (a char(10) character set utf8 collate utf8_bin);
create table t1 (a char(10) character set utf8 collate utf8_bin);
insert into t1 values (' xxx');
insert into t1 values (' xxx');
select * from t1 where a=lpad('xxx',10,' ');
select * from t1 where a=lpad('xxx',10,' ');
...
...
mysql-test/t/ctype_recoding.test
View file @
d1b4cee8
...
@@ -152,6 +152,16 @@ select * from t1 where a=_latin1'
...
@@ -152,6 +152,16 @@ select * from t1 where a=_latin1'
drop
table
t1
;
drop
table
t1
;
set
names
latin1
;
set
names
latin1
;
#
# Test the same with ascii
#
set
names
ascii
;
create
table
t1
(
a
char
(
1
)
character
set
latin1
);
insert
into
t1
values
(
'a'
);
select
*
from
t1
where
a
=
'a'
;
drop
table
t1
;
set
names
latin1
;
#
#
# Bug#10446 Illegal mix of collations
# Bug#10446 Illegal mix of collations
#
#
...
...
sql/sql_string.cc
View file @
d1b4cee8
...
@@ -263,8 +263,6 @@ bool String::needs_conversion(uint32 arg_length,
...
@@ -263,8 +263,6 @@ bool String::needs_conversion(uint32 arg_length,
(
to_cs
==
&
my_charset_bin
)
||
(
to_cs
==
&
my_charset_bin
)
||
(
to_cs
==
from_cs
)
||
(
to_cs
==
from_cs
)
||
my_charset_same
(
from_cs
,
to_cs
)
||
my_charset_same
(
from_cs
,
to_cs
)
||
(
my_charset_is_ascii_based
(
to_cs
)
&&
my_charset_is_8bit_pure_ascii
(
from_cs
))
||
((
from_cs
==
&
my_charset_bin
)
&&
((
from_cs
==
&
my_charset_bin
)
&&
(
!
(
*
offset
=
(
arg_length
%
to_cs
->
mbminlen
)))))
(
!
(
*
offset
=
(
arg_length
%
to_cs
->
mbminlen
)))))
return
FALSE
;
return
FALSE
;
...
...
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