1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875v2

Browse Source 
into  mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl


mysql-test/r/ctype_recoding.result:
  Auto merged
mysql-test/t/ctype_recoding.test:
  Auto merged
sql/sql_string.cc:
  Auto merged
This commit is contained in:
unknown 2007-08-07 19:30:23 +05:00
commit fa85d64d5b
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/ctype_recoding.result
View File

@ -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,' ');

10
mysql-test/t/ctype_recoding.test
View File

@ -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
# #

2
sql/sql_string.cc
View File

@ -253,8 +253,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;