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

sql_string.cc:

Browse Source 
Rewrote to comply the coding style
This commit is contained in:
bar@bar.intranet.mysql.r18.ru 2004-01-21 14:32:02 +04:00
parent 03d00c7da9
commit daf0bba236
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_string.cc
View File

@ -240,17 +240,12 @@ bool String::needs_conversion(const char *str, uint32 arg_length,
CHARSET_INFO *from_cs,
CHARSET_INFO *to_cs)
{
if (to_cs == &my_charset_bin)
if ((to_cs == &my_charset_bin) ||
(to_cs == from_cs) ||
my_charset_same(from_cs, to_cs) ||
((from_cs == &my_charset_bin) && (!(arg_length % to_cs->mbminlen))))
return FALSE;
if (to_cs == from_cs)
return FALSE;
if (my_charset_same(from_cs, to_cs))
return FALSE;
if ((from_cs == &my_charset_bin))
{
if (!(arg_length % to_cs->mbminlen))
return FALSE;
}
return TRUE;
}