summaryrefslogtreecommitdiff
path: root/sql/lex.h
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2017-01-31 10:32:59 -0800
committerIgor Babaev <igor@askmonty.org>2017-01-31 20:37:26 -0800
commit9073f9fd7da80752c4fcb7c6bed1d51b4853d3ce (patch)
treee25dc3164f756f3482e8b1f139c79eb6c1708706 /sql/lex.h
parent81c1abe8cf3dda1fe097256a06daab3041409e14 (diff)
downloadmariadb-git-9073f9fd7da80752c4fcb7c6bed1d51b4853d3ce.tar.gz
Fixed bug mdev-9976.
This bug happens due to a conflict in the construct window_spec. (win_ref conflicts with the non-reserved key word ROWS). The standard SQL-2003 says that ROWS is a reserved key word. Made this key word reserved in our grammar and removed the conflict.
Diffstat (limited to 'sql/lex.h')
-rw-r--r--sql/lex.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/lex.h b/sql/lex.h
index c40aa8f546d..baeae088234 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -517,8 +517,8 @@ static SYMBOL symbols[] = {
{ "ROLLUP", SYM(ROLLUP_SYM)},
{ "ROUTINE", SYM(ROUTINE_SYM)},
{ "ROW", SYM(ROW_SYM)},
- { "ROW_COUNT", SYM(ROW_COUNT_SYM)},
{ "ROWS", SYM(ROWS_SYM)},
+ { "ROW_COUNT", SYM(ROW_COUNT_SYM)},
{ "ROW_FORMAT", SYM(ROW_FORMAT_SYM)},
{ "RTREE", SYM(RTREE_SYM)},
{ "SAVEPOINT", SYM(SAVEPOINT_SYM)},