Revert "MDEV-30151 parse error 1=2 not between/in"

This reverts commit eba0991. A different patch with less shift-reduce conflicts is coming.
MariaDB · Jan 26, 2023 · b1043ea · b1043ea
1 parent 4652260
commit b1043ea
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 25 deletions.
diff --git a/mysql-test/main/parser.result b/mysql-test/main/parser.result
@@ -1866,15 +1866,4 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 EXECUTE IMMEDIATE 'CREATE PROCEDURE p() UPDATE t SET c=\'\'"abc';
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '"abc' at line 1
 SET @@sql_mode=@save_sql_mode;
-#
-# MDEV-30151 parse error 1=2 not between/in
-#
-select 1=2 not in (3,4);
-1=2 not in (3,4)
-1
-select 1=2 not between 3 and 4;
-1=2 not between 3 and 4
-1
-#
 # End of 10.3 tests
-#
diff --git a/mysql-test/main/parser.test b/mysql-test/main/parser.test
@@ -1673,12 +1673,4 @@ EXECUTE IMMEDIATE 'CREATE PROCEDURE p() UPDATE t SET c=\'\'"abc';
 
 SET @@sql_mode=@save_sql_mode;
 
---echo #
---echo # MDEV-30151 parse error 1=2 not between/in
---echo #
-select 1=2 not in (3,4);
-select 1=2 not between 3 and 4;
-
---echo #
 --echo # End of 10.3 tests
---echo #
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
@@ -899,7 +899,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
 /*
   We should not introduce any further shift/reduce conflicts.
 */
-%expect 96
+%expect 85
 
 /*
    Comments for TOKENS.
@@ -1687,7 +1687,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
 
 %left   PREC_BELOW_NOT
 
-%nonassoc LOW_PRIORITY_NOT
+%nonassoc NOT_SYM
 %left   '=' EQUAL_SYM GE '>' LE '<' NE
 %nonassoc IS
 %right BETWEEN_SYM
@@ -9840,7 +9840,7 @@ expr:
                 MYSQL_YYABORT;
             }
           }
-        | NOT_SYM expr %prec LOW_PRIORITY_NOT
+        | NOT_SYM expr %prec NOT_SYM
           {
             $$= negate_expression(thd, $2);
             if (unlikely($$ == NULL))

diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy
@@ -293,7 +293,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
 /*
   We should not introduce any further shift/reduce conflicts.
 */
-%expect 98
+%expect 87
 
 /*
    Comments for TOKENS.
@@ -1081,7 +1081,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
 
 %left   PREC_BELOW_NOT
 
-%nonassoc LOW_PRIORITY_NOT
+%nonassoc NOT_SYM
 %left   '=' EQUAL_SYM GE '>' LE '<' NE
 %nonassoc IS
 %right BETWEEN_SYM
@@ -9797,7 +9797,7 @@ expr:
                 MYSQL_YYABORT;
             }
           }
-        | NOT_SYM expr %prec LOW_PRIORITY_NOT
+        | NOT_SYM expr %prec NOT_SYM
           {
             $$= negate_expression(thd, $2);
             if (unlikely($$ == NULL))