diff options
| author | antony@ltantony.rdg.cyberkinetica.homeunix.net <> | 2004-11-17 15:49:10 +0000 |
|---|---|---|
| committer | antony@ltantony.rdg.cyberkinetica.homeunix.net <> | 2004-11-17 15:49:10 +0000 |
| commit | 8c0d21d18640a9256ddd8ed2674a2b95dbc934bf (patch) | |
| tree | 64d4ad2d56e8db843d4d3030e373422b4c15938b /sql/lex.h | |
| parent | 505324c17a8adb0534f24ce1c21212448b87362c (diff) | |
| download | mariadb-git-8c0d21d18640a9256ddd8ed2674a2b95dbc934bf.tar.gz | |
WL#638 - Fix precedence for parsing NOT ... LIKE expression s
Rework parser expression rules
Rework handling for "||" concat/or
Eliminate some shift/reduce conflicts
Add support for "xxx IS [ NOT ] truth_value"
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/lex.h b/sql/lex.h index db31b3af994..cf0059a1397 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -48,7 +48,7 @@ SYM_GROUP sym_group_rtree= {"RTree keys", "HAVE_RTREE_KEYS"}; */ static SYMBOL symbols[] = { - { "&&", SYM(AND_SYM)}, + { "&&", SYM(AND_AND_SYM)}, { "<", SYM(LT)}, { "<=", SYM(LE)}, { "<>", SYM(NE)}, @@ -334,7 +334,7 @@ static SYMBOL symbols[] = { { "NEXT", SYM(NEXT_SYM)}, { "NO", SYM(NO_SYM)}, { "NONE", SYM(NONE_SYM)}, - { "NOT", SYM(NOT)}, + { "NOT", SYM(NOT_SYM)}, { "NO_WRITE_TO_BINLOG", SYM(NO_WRITE_TO_BINLOG)}, { "NULL", SYM(NULL_SYM)}, { "NUMERIC", SYM(NUMERIC_SYM)}, @@ -489,6 +489,7 @@ static SYMBOL symbols[] = { { "UNICODE", SYM(UNICODE_SYM)}, { "UNION", SYM(UNION_SYM)}, { "UNIQUE", SYM(UNIQUE_SYM)}, + { "UNKNOWN", SYM(UNKNOWN_SYM)}, { "UNLOCK", SYM(UNLOCK_SYM)}, { "UNSIGNED", SYM(UNSIGNED)}, { "UNTIL", SYM(UNTIL_SYM)}, @@ -523,7 +524,7 @@ static SYMBOL symbols[] = { { "YEAR", SYM(YEAR_SYM)}, { "YEAR_MONTH", SYM(YEAR_MONTH_SYM)}, { "ZEROFILL", SYM(ZEROFILL)}, - { "||", SYM(OR_OR_CONCAT)} + { "||", SYM(OR_OR_SYM)} }; |