diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-08-29 18:14:14 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-08-29 18:14:14 +0300 |
| commit | 282c303746d0653a927b0fcd16ecdc9b690bbb00 (patch) | |
| tree | ff29dcc08cec23bda0dc004a6ea388f9571c1995 /client | |
| parent | 2df1914791030714196c3d829187891a97be54dc (diff) | |
| download | mariadb-git-282c303746d0653a927b0fcd16ecdc9b690bbb00.tar.gz | |
Added MariaDB executable comment syntax: /*M!##### */
client/mysql.cc:
Don't remove MariaDB executable comments.
mysql-test/r/comments.result:
Test MariaDB executable comments.
mysql-test/r/mysql.result:
Test MariaDB executable comments.
mysql-test/t/comments.test:
Test MariaDB executable comments.
mysql-test/t/mysql.test:
Test MariaDB executable comments.
sql/sql_cache.cc:
Don't delete MariaDB executable comments.
sql/sql_lex.cc:
Handle MariaDB executable comments
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 04a7a15be56..824a416ec36 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -49,7 +49,7 @@ and you are welcome to modify and redistribute it under the GPL v2 license\n" #include <locale.h> #endif -const char *VER= "15.0"; +const char *VER= "15.1"; /* Don't try to make a nice table if the data is too big */ #define MAX_COLUMN_LENGTH 1024 @@ -2302,7 +2302,7 @@ static bool add_line(String &buffer,char *line,char *in_string, break; } else if (!*in_string && inchar == '/' && *(pos+1) == '*' && - *(pos+2) != '!') + !(*(pos+2) == '!' || (*(pos+2) == 'M' && *(pos+3) == '!'))) { if (preserve_comments) { |