summaryrefslogtreecommitdiff
path: root/sql/lex.h
diff options
context:
space:
mode:
authorunknown <wax@kishkin.ru>2003-04-02 18:15:16 +0600
committerunknown <wax@kishkin.ru>2003-04-02 18:15:16 +0600
commit994a9abab551b6fd2cc0ce6cd439b1860dc10b15 (patch)
tree488579564c80c09c40acdafd8ff903c433ef47c1 /sql/lex.h
parent16ce6b7173ff558a51de3d5e7d1b6eecdf7367dd (diff)
parent1de0ce8677d1913dcb6001d701dc08712d5e93d3 (diff)
downloadmariadb-git-994a9abab551b6fd2cc0ce6cd439b1860dc10b15.tar.gz
Auto merged
BitKeeper/etc/logging_ok: auto-union
Diffstat (limited to 'sql/lex.h')
-rw-r--r--sql/lex.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h
index 01a289e4f7a..aab530251b8 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -335,6 +335,7 @@ static SYMBOL symbols[] = {
{ "ROWS", SYM(ROWS_SYM),0,0},
{ "RTREE", SYM(RTREE_SYM),0,0},
{ "SECOND", SYM(SECOND_SYM),0,0},
+ { "SEPARATOR", SYM(SEPARATOR_SYM),0,0},
{ "SELECT", SYM(SELECT_SYM),0,0},
{ "SERIAL", SYM(SERIAL_SYM),0,0},
{ "SERIALIZABLE", SYM(SERIALIZABLE_SYM),0,0},
@@ -503,6 +504,7 @@ static SYMBOL sql_functions[] = {
{ "GEOMFROMWKB", SYM(GEOMFROMWKB),0,0},
{ "GLENGTH", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_glength)},
{ "GREATEST", SYM(GREATEST_SYM),0,0},
+ { "GROUP_CONCAT", SYM(GROUP_CONCAT_SYM),0,0},
{ "GROUP_UNIQUE_USERS", SYM(GROUP_UNIQUE_USERS),0,0},
{ "HEX", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_hex)},
{ "IFNULL", SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_ifnull)},