diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-12-19 17:54:02 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-12-19 17:54:02 +0400 |
| commit | e9b3c97141f7605e8fdb304f08b61b5ef63116ca (patch) | |
| tree | c60353c2f75db184024a80fd0bda064cb00e89a4 /sql/sql_lex.cc | |
| parent | 06ebc6cc503ddd573165574775607cb23aa1143e (diff) | |
| parent | e1b2de5f0b55badf3fe6d45db1d9306a4a33cf18 (diff) | |
| download | mariadb-git-e9b3c97141f7605e8fdb304f08b61b5ef63116ca.tar.gz | |
Merge 10.0-base->10.0
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 bcabf9bd150..96dce0acf2a 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1563,11 +1563,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); |