diff options
author | Sinisa@sinisa.nasamreza.org <> | 2003-02-13 15:16:00 +0200 |
---|---|---|
committer | Sinisa@sinisa.nasamreza.org <> | 2003-02-13 15:16:00 +0200 |
commit | c75fa953e367f938d472bfee48ba2038d161b97c (patch) | |
tree | 7700da83ed6388999914b1d35e5e5463fa4574db /client/mysql.cc | |
parent | 32da4054eeec7aee697c1b98e888ec2c1f814401 (diff) | |
parent | 33303f2837a0d7fa756040c990226f4f0665d67f (diff) | |
download | mariadb-git-c75fa953e367f938d472bfee48ba2038d161b97c.tar.gz |
merge
Diffstat (limited to 'client/mysql.cc')
-rw-r--r-- | client/mysql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 41da0113670..afae4b28960 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1036,7 +1036,7 @@ static bool add_line(String &buffer,char *line,char *in_string, inchar == '-' && pos[1] == '-' && my_isspace(system_charset_info,pos[2])))) break; // comment to end of line - else if (!*in_string && inchar == '/' && *(pos+1) == '*') + else if (!*in_string && inchar == '/' && *(pos+1) == '*' && *(pos+2) != '!') { pos++; *ml_comment= 1; |