database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Addendum #1 to the fix for bug #18359924

Browse Source 
Removed unused variable.
Fixed long (>80 lines)
This commit is contained in:
Georgi Kodinov
2014-04-11 10:42:30 +03:00
parent 37b9a31a30
commit ea38c26582
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/field.cc
View File

@ -7974,7 +7974,6 @@ int Field_enum::store(const char *from,uint length,CHARSET_INFO *cs)
{ {
ASSERT_COLUMN_MARKED_FOR_WRITE; ASSERT_COLUMN_MARKED_FOR_WRITE;
int err= 0; int err= 0;
uint32 not_used;
char buff[STRING_BUFFER_USUAL_SIZE]; char buff[STRING_BUFFER_USUAL_SIZE];
String tmpstr(buff,sizeof(buff), &my_charset_bin); String tmpstr(buff,sizeof(buff), &my_charset_bin);

16
sql/sql_string.cc
View File

@ -241,11 +241,17 @@ bool String::needs_conversion_on_storage(uint32 arg_length,
{ {
uint32 offset; uint32 offset;
return (needs_conversion(arg_length, cs_from, cs_to, &offset) || return (needs_conversion(arg_length, cs_from, cs_to, &offset) ||
(cs_from == &my_charset_bin && /* force conversion when storing a binary string */ /* force conversion when storing a binary string */
cs_to != &my_charset_bin && /* into a non-binary destination */ (cs_from == &my_charset_bin &&
( /* and any of the following is true :*/ /* into a non-binary destination */
cs_to->mbminlen != cs_to->mbmaxlen || /* it's a variable length encoding */ cs_to != &my_charset_bin &&
cs_to->mbminlen > 2 || /* longer than 2 bytes : neither 1 byte nor ucs2 */ /* and any of the following is true :*/
(
/* it's a variable length encoding */
cs_to->mbminlen != cs_to->mbmaxlen ||
/* longer than 2 bytes : neither 1 byte nor ucs2 */
cs_to->mbminlen > 2 ||
/* and is not a multiple of the char byte size */
0 != (arg_length % cs_to->mbmaxlen) 0 != (arg_length % cs_to->mbmaxlen)
) )
) )