diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-12-19 17:50:08 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-12-19 17:50:08 +0400 |
| commit | e1b2de5f0b55badf3fe6d45db1d9306a4a33cf18 (patch) | |
| tree | 6504c7be436e67e676c661a2cc68d5038dbc482b /sql/sql_lex.cc | |
| parent | fa7faa2955cf6d6c0af294c3ad6714e206ee2889 (diff) | |
| download | mariadb-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 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 9acbdc641eb..a89056eaf79 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -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 MariaDB-10.0 does not understand. Ignore all versioned comments - with MySQL versions in the range 50700–999999, but + with MySQL versions in the range 50700-999999, but do not ignore MariaDB specific comments for the same versions. */ 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' */ lip->yySkipn(length); |