1 files changed, 26 insertions, 4 deletions
diff --git a/mysql-test/t/comments.test b/mysql-test/t/comments.test
index 4d47674650c..6cf69635d1e 100644
--- a/mysql-test/t/comments.test
+++ b/mysql-test/t/comments.test
@@ -8,7 +8,7 @@ multi line comment */;
 --error 1065
  ;
 select 1 /*!32301 +1 */;
-select 1 /*!52301 +1 */;
+select 1 /*!952301 +1 */;
 select 1--1;
 # Note that the following returns 4 while it should return 2
 # This is because the mysqld server doesn't parse -- comments
@@ -29,9 +29,31 @@ select 1 /*M!50000 +1 */;
 select 1 /*M!50300 +1 */;
 select 2 /*M!99999 +1 */;
 select 2 /*M!100000 +1 */;
+select 2 /*M!999999 +1 */;
 --error ER_PARSE_ERROR
 select 2 /*M!0000 +1 */;
 
+--echo #
+--echo # Testing that MySQL versions >= 5.7.x and < 10.0.0 are ignored (MDEV-5009)
+--echo #
+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 
+--echo # when used with the MariaDB executable comment syntax.
+--echo #
+SELECT 1 /*M!50699 +1*/;
+SELECT 1 /*M!50700 +1*/;
+SELECT 1 /*M!50999 +1*/;
+SELECT 1 /*M!99999 +1*/;
+SELECT 1 /*M!100000 +1*/;
+SELECT 1 /*M!110000 +1*/;
+
 #
 # Bug#25411 (trigger code truncated)
 #
@@ -44,7 +66,7 @@ select 1/*!0000002*/;
 
 select 1/*!999992*/;
 
-select 1 + /*!00000 2 */ + 3 /*!99999 noise*/ + 4;
+select 1 + /*!00000 2 */ + 3 /*!999999 noise*/ + 4;
 
 #
 # Bug#28779 (mysql_query() allows execution of statements with unbalanced
@@ -70,10 +92,10 @@ prepare bar from "DELETE FROM table_28779 WHERE a = 7 OR 1=1/*! AND 2=2;";
 prepare bar from "DELETE FROM table_28779 WHERE a = 7 OR 1=1/*! AND 2=2;*";
 
 --error 1064
-prepare bar from "DELETE FROM table_28779 WHERE a = 7 OR 1=1/*!98765' AND b = 'bar';";
+prepare bar from "DELETE FROM table_28779 WHERE a = 7 OR 1=1/*!998765' AND b = 'bar';";
 
 --error 1064
-prepare bar from "DELETE FROM table_28779 WHERE a = 7 OR 1=1/*!98765' AND b = 'bar';*";
+prepare bar from "DELETE FROM table_28779 WHERE a = 7 OR 1=1/*!998765' AND b = 'bar';*";
 
 drop table table_28779;