Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/4.1
This commit is contained in:
commit
11b7605a53
@ -1094,12 +1094,11 @@ static bool add_line(String &buffer,char *line,char *in_string,
|
||||
{ // Add found char to buffer
|
||||
if (inchar == *in_string)
|
||||
*in_string= 0;
|
||||
else if (!*ml_comment)
|
||||
{
|
||||
if (!*in_string && (inchar == '\'' || inchar == '"' || inchar == '`'))
|
||||
*in_string= (char) inchar;
|
||||
else if (!*ml_comment && !*in_string &&
|
||||
(inchar == '\'' || inchar == '"' || inchar == '`'))
|
||||
*in_string= (char) inchar;
|
||||
if (!*ml_comment)
|
||||
*out++= (char) inchar;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (out != line || !buffer.is_empty())
|
||||
|
Loading…
x
Reference in New Issue
Block a user