From d43410737b01c024afa1d5b44fa85846df42d080 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 8 May 2005 00:13:35 +0100 Subject: Bug#6925 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. --- client/mysql.cc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/client/mysql.cc b/client/mysql.cc index c3a3b3df6d4..e0ed85f2651 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1100,6 +1100,7 @@ static bool add_line(String &buffer,char *line,char *in_string, uchar inchar; char buff[80], *pos, *out; COMMANDS *com; + bool need_space= 0; if (!line[0] && buffer.is_empty()) return 0; @@ -1208,6 +1209,7 @@ static bool add_line(String &buffer,char *line,char *in_string, { pos++; *ml_comment= 0; + need_space= 1; } else { // Add found char to buffer @@ -1217,7 +1219,14 @@ static bool add_line(String &buffer,char *line,char *in_string, (inchar == '\'' || inchar == '"' || inchar == '`')) *in_string= (char) inchar; if (!*ml_comment) + { + if (need_space && !my_isspace(charset_info, (char)inchar)) + { + *out++= ' '; + need_space= 0; + } *out++= (char) inchar; + } } } if (out != line || !buffer.is_empty()) -- cgit v1.2.1