1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.r18.ru:/usr/home/ram/work/4.1
This commit is contained in:
ram@mysql.r18.ru 2003-07-15 17:56:20 +05:00
commit 11b7605a53
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/mysql.cc
View File

@ -1094,12 +1094,11 @@ static bool add_line(String &buffer,char *line,char *in_string,
{ // Add found char to buffer { // Add found char to buffer
if (inchar == *in_string) if (inchar == *in_string)
*in_string= 0; *in_string= 0;
else if (!*ml_comment) else if (!*ml_comment && !*in_string &&
{ (inchar == '\'' || inchar == '"' || inchar == '`'))
if (!*in_string && (inchar == '\'' || inchar == '"' || inchar == '`')) *in_string= (char) inchar;
*in_string= (char) inchar; if (!*ml_comment)
*out++= (char) inchar; *out++= (char) inchar;
}
} }
} }
if (out != line || !buffer.is_empty()) if (out != line || !buffer.is_empty())