mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Bug#13487 Japanese data inside a comment causes the syntax error
mysql.cc: Fixed not to copy multibyte characters to the target string if we are inside a comment. client/mysql.cc: Bug#13487 Japanese data inside a comment causes the syntax error Fixed not to copy multibyte characters to the target string if we are inside a comment. ,
This commit is contained in:
@@ -1157,11 +1157,17 @@ static bool add_line(String &buffer,char *line,char *in_string,
|
|||||||
#ifdef USE_MB
|
#ifdef USE_MB
|
||||||
int l;
|
int l;
|
||||||
if (use_mb(charset_info) &&
|
if (use_mb(charset_info) &&
|
||||||
(l = my_ismbchar(charset_info, pos, strend))) {
|
(l= my_ismbchar(charset_info, pos, strend)))
|
||||||
while (l--)
|
{
|
||||||
*out++ = *pos++;
|
if (!*ml_comment)
|
||||||
pos--;
|
{
|
||||||
continue;
|
while (l--)
|
||||||
|
*out++ = *pos++;
|
||||||
|
pos--;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
pos+= l - 1;
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if (!*ml_comment && inchar == '\\')
|
if (!*ml_comment && inchar == '\\')
|
||||||
|
Reference in New Issue
Block a user