Commit 08bf55c7 authored by unknown's avatar unknown

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

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


client/mysql.cc:
  Auto merged
parents 05414133 1bdd8a62
......@@ -1157,10 +1157,16 @@ static bool add_line(String &buffer,char *line,char *in_string,
#ifdef USE_MB
int l;
if (use_mb(charset_info) &&
(l = my_ismbchar(charset_info, pos, strend))) {
(l= my_ismbchar(charset_info, pos, strend)))
{
if (!*ml_comment)
{
while (l--)
*out++ = *pos++;
pos--;
}
else
pos+= l - 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