Merge 10.0-base->10.0

3 files changed, 10 insertions, 2 deletions

diff --git a/mysql-test/r/comments.result b/mysql-test/r/comments.result
index 1e94c6ee2eb..ce817b5012f 100644
--- a/mysql-test/r/comments.result
+++ b/mysql-test/r/comments.result
@@ -55,6 +55,12 @@ SELECT 1 /*!50999 +1*/;
 SELECT 1 /*!99999 +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 
 # when used with the MariaDB executable comment syntax.
diff --git a/mysql-test/t/comments.test b/mysql-test/t/comments.test
index 39d69ae0b4c..ce4f4d50675 100644
--- a/mysql-test/t/comments.test
+++ b/mysql-test/t/comments.test
@@ -38,6 +38,8 @@ SELECT 1 /*!50699 +1*/;
 SELECT 1 /*!50700 +1*/;
 SELECT 1 /*!50999 +1*/;
 SELECT 1 /*!99999 +1*/;
+SELECT 1 /*!100000 +1*/;
+SELECT 1 /*!110000 +1*/;
 
 --echo #
 --echo # Tesing that versions >= 5.7.x and < 10.0.0 are not ignored 
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);