summaryrefslogtreecommitdiff
path: root/mysql-test/r/comments.result
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mnogosearch.org>2013-12-19 17:50:08 +0400
committerAlexander Barkov <bar@mnogosearch.org>2013-12-19 17:50:08 +0400
commite1b2de5f0b55badf3fe6d45db1d9306a4a33cf18 (patch)
tree6504c7be436e67e676c661a2cc68d5038dbc482b /mysql-test/r/comments.result
parentfa7faa2955cf6d6c0af294c3ad6714e206ee2889 (diff)
downloadmariadb-git-e1b2de5f0b55badf3fe6d45db1d9306a4a33cf18.tar.gz
A post-fix for MDEV-5009 don't look inside /*!50700 ... */ comments
Fixing "/*100000 ...*/" comments (i.e. MySQL style with 6-digits), which were unintentionally broken in the MDEV-5009 patch. modified: mysql-test/r/comments.result mysql-test/t/comments.test sql/sql_lex.cc
Diffstat (limited to 'mysql-test/r/comments.result')
-rw-r--r--mysql-test/r/comments.result6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/comments.result b/mysql-test/r/comments.result
index 1e94c6ee2eb..ce817b5012f 100644
--- a/mysql-test/r/comments.result
+++ b/mysql-test/r/comments.result
@@ -55,6 +55,12 @@ SELECT 1 /*!50999 +1*/;
SELECT 1 /*!99999 +1*/;
1
1
+SELECT 1 /*!100000 +1*/;
+1 +1
+2
+SELECT 1 /*!110000 +1*/;
+1
+1
#
# Tesing that versions >= 5.7.x and < 10.0.0 are not ignored
# when used with the MariaDB executable comment syntax.