mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 15:24:16 +01:00
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
This commit is contained in:
commit
6bbd6931bf
1 changed files with 4 additions and 5 deletions
|
@ -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…
Add table
Reference in a new issue