database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

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

Browse Source 
This reverts commit eba099184e.

A different patch with less shift-reduce conflicts is coming.
This commit is contained in:
Alexander Barkov
2023-01-26 10:57:01 +04:00
parent 4652260d65
commit b1043ea0ed
4 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/main/parser.result
View File

@ -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'; 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 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; 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 # End of 10.3 tests
#

8
mysql-test/main/parser.test
View File

@ -1673,12 +1673,4 @@ EXECUTE IMMEDIATE 'CREATE PROCEDURE p() UPDATE t SET c=\'\'"abc';
SET @@sql_mode=@save_sql_mode; 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 # End of 10.3 tests
--echo #

6
sql/sql_yacc.yy
View File

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

6
sql/sql_yacc_ora.yy
View File

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