database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge 10.0-base->10.0

Browse Source
This commit is contained in:
Alexander Barkov
2013-12-19 17:54:02 +04:00
parent 06ebc6cc50 e1b2de5f0b
commit e9b3c97141
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_lex.cc
View File

@@ -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);