Commit aec79cc4 authored by bar@mysql.com's avatar bar@mysql.com

Merge mysql.com:/usr/home/bar/mysql-4.1

into  mysql.com:/usr/home/bar/mysql-5.0
parents a3eea884 48238e1b
......@@ -1193,11 +1193,16 @@ static bool add_line(String &buffer,char *line,char *in_string,
#ifdef USE_MB
int length;
if (use_mb(charset_info) &&
(length= my_ismbchar(charset_info, pos, end_of_line)))
(lenght= my_ismbchar(charset_info, pos, end_of_line)))
{
while (length--)
*out++ = *pos++;
pos--;
if (!*ml_comment)
{
while (lenght--)
*out++ = *pos++;
pos--;
}
else
pos+= lenght - 1;
continue;
}
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment