Commit 40eb77b7 authored by unknown's avatar unknown
Browse files

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.
parent 1e871729

client/mysql.cc

+9 −0
Original line number Diff line number Diff line
@@ -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,9 +1219,16 @@ 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())

  {

    *out++='\n';