database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Bug#6925

Browse Source 
Comment/*COMMENT*/is not a separator
  Ensure that whitespace is inserted after C-style comment if required.


client/mysql.cc:
  Ensure that whitespace is inserted after C-style comment if required.
This commit is contained in:
unknown
2005-05-08 00:13:35 +01:00
parent 1e871729bd
commit 40eb77b72a
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/mysql.cc
View File

@ -1100,6 +1100,7 @@ static bool add_line(String &buffer,char *line,char *in_string,
uchar inchar; uchar inchar;
char buff[80], *pos, *out; char buff[80], *pos, *out;
COMMANDS *com; COMMANDS *com;
bool need_space= 0;
if (!line[0] && buffer.is_empty()) if (!line[0] && buffer.is_empty())
return 0; return 0;
@ -1208,6 +1209,7 @@ static bool add_line(String &buffer,char *line,char *in_string,
{ {
pos++; pos++;
*ml_comment= 0; *ml_comment= 0;
need_space= 1;
} }
else else
{ // Add found char to buffer { // Add found char to buffer
@ -1217,7 +1219,14 @@ static bool add_line(String &buffer,char *line,char *in_string,
(inchar == '\'' || inchar == '"' || inchar == '`')) (inchar == '\'' || inchar == '"' || inchar == '`'))
*in_string= (char) inchar; *in_string= (char) inchar;
if (!*ml_comment) if (!*ml_comment)
{
if (need_space && !my_isspace(charset_info, (char)inchar))
{
*out++= ' ';
need_space= 0;
}
*out++= (char) inchar; *out++= (char) inchar;
}
} }
} }
if (out != line || !buffer.is_empty()) if (out != line || !buffer.is_empty())