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 /mysql-test/t/comments.test | |
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 'mysql-test/t/comments.test')
-rw-r--r-- | mysql-test/t/comments.test | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/t/comments.test b/mysql-test/t/comments.test index 3a18a8bd483..08c74c99d0c 100644 --- a/mysql-test/t/comments.test +++ b/mysql-test/t/comments.test @@ -21,6 +21,17 @@ select 1 # The rest of the row will be ignored # End of 4.1 tests # +# Testing of MariaDB executable comments +# + +select 1 /*M! +1 */; +select 1 /*M!50000 +1 */; +select 1 /*M!50300 +1 */; +select 2 /*M!99999 +1 */; +--error ER_PARSE_ERROR +select 2 /*M!0000 +1 */; + +# # Bug#25411 (trigger code truncated) # |