diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2003-10-20 13:45:28 +0500 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2003-10-20 13:45:28 +0500 |
| commit | b1b45a8357f1e118cb1436f17c8c69ad57595a0a (patch) | |
| tree | 47e63db5fc732a256e07ddbbe3a8559cf084288c /sql/lex.h | |
| parent | 2a98f2943e1a4548d3e7fa20d2e517a11c021556 (diff) | |
| parent | 299fc6a9f536571998f1fbc69a599800d3c95166 (diff) | |
| download | mariadb-git-b1b45a8357f1e118cb1436f17c8c69ad57595a0a.tar.gz | |
Merge commit
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/lex.h:
Auto merged
sql/protocol.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h index f8bb34c5c5b..5d79e378d4f 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -177,6 +177,7 @@ static SYMBOL symbols[] = { { "FUNCTION", SYM(UDF_SYM),0,0}, { "GEOMETRY", SYM(GEOMETRY_SYM),0,0}, { "GEOMETRYCOLLECTION",SYM(GEOMETRYCOLLECTION),0,0}, + { "GET_FORMAT", SYM(GET_FORMAT),0,0}, { "GLOBAL", SYM(GLOBAL_SYM),0,0}, { "GRANT", SYM(GRANT),0,0}, { "GRANTS", SYM(GRANTS),0,0}, @@ -640,6 +641,7 @@ static SYMBOL sql_functions[] = { { "STARTPOINT", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_startpoint)}, { "STD", SYM(STD_SYM),0,0}, { "STDDEV", SYM(STD_SYM),0,0}, + { "STR_TO_DATE", SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_str_to_date)}, { "STRCMP", SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_strcmp)}, { "SUBSTR", SYM(SUBSTRING),0,0}, { "SUBSTRING", SYM(SUBSTRING),0,0}, |