database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

mysql should ignore ' " ` symbols inside comments (Bug #539).

Browse Source
This commit is contained in:
ram@mysql.r18.ru
2003-07-15 14:38:48 +05:00
parent 04ac36a467
commit e1aaa670cc
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/mysql.cc
View File

@ -1085,7 +1085,7 @@ static bool add_line(String &buffer,char *line,char *in_string,
out=line; out=line;
} }
} }
else if (*ml_comment && !*in_string && inchar == '*' && *(pos+1) == '/') else if (*ml_comment && inchar == '*' && *(pos + 1) == '/')
{ {
pos++; pos++;
*ml_comment= 0; *ml_comment= 0;
@ -1093,11 +1093,13 @@ static bool add_line(String &buffer,char *line,char *in_string,
else else
{ // 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 (!*in_string && (inchar == '\'' || inchar == '"' || inchar == '`')) else if (!*ml_comment)
*in_string=(char) inchar; {
if (!(*ml_comment)) if (!*in_string && (inchar == '\'' || inchar == '"' || inchar == '`'))
*out++ = (char) inchar; *in_string= (char) inchar;
*out++= (char) inchar;
}
} }
} }
if (out != line || !buffer.is_empty()) if (out != line || !buffer.is_empty())