diff options
| author | unknown <bar@bar.myoffice.izhnet.ru> | 2007-08-07 19:30:23 +0500 |
|---|---|---|
| committer | unknown <bar@bar.myoffice.izhnet.ru> | 2007-08-07 19:30:23 +0500 |
| commit | fa85d64d5bedc91bebf3e5ea2f895b2991a4a9d3 (patch) | |
| tree | 3d95eec19df9908fe08f0ab8ccfd11071860b103 /sql/sql_string.cc | |
| parent | 78a52138c7aaee9ec67c1041d9b7ecd2e45fc79a (diff) | |
| parent | c6e88899460bd3478761f37a873a822f379a170d (diff) | |
| download | mariadb-git-fa85d64d5bedc91bebf3e5ea2f895b2991a4a9d3.tar.gz | |
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875v2
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
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 53b2499846c..6c7dea6bf22 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -253,8 +253,6 @@ bool String::needs_conversion(uint32 arg_length, (to_cs == &my_charset_bin) || (to_cs == from_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) && (!(*offset=(arg_length % to_cs->mbminlen))))) return FALSE; |