Commit 7ad63a72 authored by Gleb Shchepa's avatar Gleb Shchepa
Browse files

Bug #36244: MySQL CLI doesn't recognize standalone -- 

            as a commentary

mysql client has been modified to interpret EOL after
standalone -- commentary strings like whitespace
character (according to
http://dev.mysql.com/doc/refman/5.0/en/ansi-diff-comments.html)
parent 9b6a012c

client/mysql.cc

+8 −1
Original line number Diff line number Diff line
@@ -2156,7 +2156,14 @@ static bool add_line(String &buffer,char *line,char *in_string, 
    }

    else if (!*ml_comment && (!*in_string && (inchar == '#' ||

			      inchar == '-' && pos[1] == '-' &&

			      my_isspace(charset_info,pos[2]))))

                              /*

                                The third byte is either whitespace or is the

                                end of the line -- which would occur only

                                because of the user sending newline -- which is

                                itself whitespace and should also match.

                              */

			      (my_isspace(charset_info,pos[2]) ||

                               !pos[2]))))

    {

      // Flush previously accepted characters

      if (out != line)

mysql-test/t/mysql_delimiter.sql

+7 −0
Original line number Diff line number Diff line
@@ -59,3 +59,10 @@ source t/mysql_delimiter_19799.sql 
use test//

show tables//

delimiter ; # Reset delimiter



#

# Bug #36244: MySQL CLI doesn't recognize standalone -- as comment

#             before DELIMITER statement

#

--

DELIMITER ;