From b1043ea0ed01a7caa398d4a066b415d6eeebb08e Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mariadb.com>
Date: Thu, 26 Jan 2023 10:57:01 +0400
Subject: Revert "MDEV-30151 parse error 1=2 not between/in"

This reverts commit eba099184e1f6704894694ea41f97f216eae5f21.

A different patch with less shift-reduce conflicts is coming.
---
 sql/sql_yacc.yy | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sql/sql_yacc.yy')

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 3025d93de0f..7766049c104 100644
--- 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))
-- 
cgit v1.2.1