database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code 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
This commit is contained in:
bar@bar.myoffice.izhnet.ru
2007-08-07 19:30:23 +05:00
parent 92d4958eb7 7269c6cc6c
commit 2be7a90a9a
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 == 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;