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 /sql/sql_cache.cc | |
| 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 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index d7040a825fb..5378390ebb4 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -491,11 +491,12 @@ static void make_base_query(String *new_query, continue; // Continue with next symbol case '/': // Start of comment ? /* - Comment of format /#!number #/, must be skipped. + Comment of format /#!number #/ or /#M!number #/, must be skipped. These may include '"' and other comments, but it should be safe to parse the content as a normal string. */ - if (query[0] != '*' || query[1] == '!') + if (query[0] != '*' || query[1] == '!' || + (query[1] == 'M' && query[2] == '!')) break; query++; // skip "/" |