Fix valgrind warning + post-merge fixes.

This commit is contained in:
konstantin@mysql.com 2005-01-13 19:03:21 +03:00
commit 9e10645cff
2 changed files with 5 additions and 5 deletions

View file

@ -7220,7 +7220,7 @@ static int my_strnxfrm_uca(CHARSET_INFO *cs,
uchar *dst, uint dstlen,
const uchar *src, uint srclen)
{
uchar *de = dst + (dstlen & (uint) ~1); // add even length for easier code
uchar *de = dst + (dstlen & (uint) ~1); /* add even length for easier code */
int s_res;
my_uca_scanner scanner;
scanner_handler->init(&scanner, cs, src, srclen);
@ -7238,7 +7238,7 @@ static int my_strnxfrm_uca(CHARSET_INFO *cs,
dst[1]= s_res & 0xFF;
dst+= 2;
}
if (dstlen & 1) // if odd number then fill the last char
if (dstlen & 1) /* if odd number then fill the last char */
*dst= '\0';
return dstlen;