← Back to branch summary

~maria-captains/maria/10.0

« back to all changes in this revision

Viewing changes to sql/sql_lex.cc

  • Committer: Alexander Barkov
  • Date: 2013-12-19 13:54:02 UTC
  • mfrom: (3427.35.229 maria-10.0-base)
  • Revision ID: bar@mnogosearch.org-20131219135402-9j1ig0v8w36h4bnd
Merge 10.0-base->10.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_lex.cc
1563
1563
          /*
1564
1564
            MySQL-5.7 has new features and might have new SQL syntax that
1565
1565
            MariaDB-10.0 does not understand. Ignore all versioned comments
1566
 
            with MySQL versions in the range 50700–999999, but
 
1566
            with MySQL versions in the range 50700-999999, but
1567
1567
            do not ignore MariaDB specific comments for the same versions.
1568
1568
          */ 
1569
1569
          if (version <= MYSQL_VERSION_ID &&
1570
 
              (version < 50700 || version > 999999 || maria_comment_syntax))
 
1570
              (version < 50700 || version > 99999 || maria_comment_syntax))
1571
1571
          {
1572
1572
            /* Accept 'M' 'm' 'm' 'd' 'd' */
1573
1573
            lip->yySkipn(length);