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.b28875

Browse Source 
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b28875
This commit is contained in:
bar@bar.myoffice.izhnet.ru
2007-08-03 17:16:02 +05:00
parent f42cf05ad4 4eebfd09c2
commit fb8dff9721
20 changed files with 431 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_string.cc
View File

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