Commit e1b2de5f authored by Alexander Barkov's avatar Alexander Barkov

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
parent fa7faa29
...@@ -55,6 +55,12 @@ SELECT 1 /*!50999 +1*/; ...@@ -55,6 +55,12 @@ SELECT 1 /*!50999 +1*/;
SELECT 1 /*!99999 +1*/; SELECT 1 /*!99999 +1*/;
1 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 # Tesing that versions >= 5.7.x and < 10.0.0 are not ignored
# when used with the MariaDB executable comment syntax. # when used with the MariaDB executable comment syntax.
......
...@@ -38,6 +38,8 @@ SELECT 1 /*!50699 +1*/; ...@@ -38,6 +38,8 @@ SELECT 1 /*!50699 +1*/;
SELECT 1 /*!50700 +1*/; SELECT 1 /*!50700 +1*/;
SELECT 1 /*!50999 +1*/; SELECT 1 /*!50999 +1*/;
SELECT 1 /*!99999 +1*/; SELECT 1 /*!99999 +1*/;
SELECT 1 /*!100000 +1*/;
SELECT 1 /*!110000 +1*/;
--echo # --echo #
--echo # Tesing that versions >= 5.7.x and < 10.0.0 are not ignored --echo # Tesing that versions >= 5.7.x and < 10.0.0 are not ignored
......
...@@ -1555,11 +1555,11 @@ int lex_one_token(void *arg, THD *thd) ...@@ -1555,11 +1555,11 @@ int lex_one_token(void *arg, THD *thd)
/* /*
MySQL-5.7 has new features and might have new SQL syntax that MySQL-5.7 has new features and might have new SQL syntax that
MariaDB-10.0 does not understand. Ignore all versioned comments MariaDB-10.0 does not understand. Ignore all versioned comments
with MySQL versions in the range 50700999999, but with MySQL versions in the range 50700-999999, but
do not ignore MariaDB specific comments for the same versions. do not ignore MariaDB specific comments for the same versions.
*/ */
if (version <= MYSQL_VERSION_ID && if (version <= MYSQL_VERSION_ID &&
(version < 50700 || version > 999999 || maria_comment_syntax)) (version < 50700 || version > 99999 || maria_comment_syntax))
{ {
/* Accept 'M' 'm' 'm' 'd' 'd' */ /* Accept 'M' 'm' 'm' 'd' 'd' */
lip->yySkipn(length); lip->yySkipn(length);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment