diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-03 16:10:02 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-03 16:10:02 +0200 |
| commit | fb0808c450849e00993fa38839f33969a9daf7e8 (patch) | |
| tree | 55aca4c3c7dff7e09a13efa6dcfb58d5e91def35 /sql/sql_yacc.yy | |
| parent | fb41117c907a99d051ac09c229762978373d7eb0 (diff) | |
| parent | 8760f6907c51e0e20242a53188be5b62029d6f1a (diff) | |
| download | mariadb-git-fb0808c450849e00993fa38839f33969a9daf7e8.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 2682aef14d8..97bf707f7c9 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2015, Oracle and/or its affiliates. - Copyright (c) 2010, 2022, MariaDB + Copyright (c) 2010, 2023, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -834,7 +834,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); /* We should not introduce any further shift/reduce conflicts. */ -%expect 72 +%expect 83 /* Comments for TOKENS. @@ -1631,7 +1631,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); %left PREC_BELOW_NOT -%nonassoc NOT_SYM +%nonassoc LOW_PRIORITY_NOT %left '=' EQUAL_SYM GE '>' LE '<' NE %nonassoc IS %right BETWEEN_SYM @@ -10065,7 +10065,7 @@ expr: MYSQL_YYABORT; } } - | NOT_SYM expr %prec NOT_SYM + | NOT_SYM expr %prec LOW_PRIORITY_NOT { $$= negate_expression(thd, $2); if (unlikely($$ == NULL)) |