diff options
| author | unknown <peter@mysql.com> | 2002-11-29 22:03:14 +0300 |
|---|---|---|
| committer | unknown <peter@mysql.com> | 2002-11-29 22:03:14 +0300 |
| commit | 14754ce141aa6a061a94fa668094b0602edd69c5 (patch) | |
| tree | 09b5a48a4fb2649410bee507206bcfc49ee4c806 /sql/lex.h | |
| parent | c1403e17a8a663fb9621d64bcb82602eb27a0716 (diff) | |
| parent | 1d418357ed693231066aeda713617b5e19e68a85 (diff) | |
| download | mariadb-git-14754ce141aa6a061a94fa668094b0602edd69c5.tar.gz | |
Merging....
BitKeeper/etc/logging_ok:
auto-union
client/insert_test.c:
Auto merged
client/select_test.c:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_parse.cc:
Manual merge
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/lex.h b/sql/lex.h index 35a2decfc03..eb03c0b36ec 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -56,6 +56,7 @@ static SYMBOL symbols[] = { { "AGAINST", SYM(AGAINST),0,0}, { "ANALYZE", SYM(ANALYZE_SYM),0,0}, { "AND", SYM(AND),0,0}, + { "ANY", SYM(ANY_SYM),0,0}, { "AS", SYM(AS),0,0}, { "ASC", SYM(ASC),0,0}, { "AVG", SYM(AVG_SYM),0,0}, @@ -134,6 +135,7 @@ static SYMBOL symbols[] = { { "DROP", SYM(DROP),0,0}, { "DUMPFILE", SYM(DUMPFILE),0,0}, { "DYNAMIC", SYM(DYNAMIC_SYM),0,0}, + { "DUPLICATE", SYM(DUPLICATE),0,0}, { "ERRORS", SYM(ERRORS),0,0}, { "END", SYM(END),0,0}, { "ELSE", SYM(ELSE),0,0}, @@ -221,6 +223,8 @@ static SYMBOL symbols[] = { { "LIMIT", SYM(LIMIT),0,0}, { "LOAD", SYM(LOAD),0,0}, { "LOCAL", SYM(LOCAL_SYM),0,0}, + { "LOCALTIME", SYM(NOW_SYM),0,0}, + { "LOCALTIMESTAMP", SYM(NOW_SYM),0,0}, { "LOCK", SYM(LOCK_SYM),0,0}, { "LOCKS", SYM(LOCKS_SYM),0,0}, { "LOGS", SYM(LOGS_SYM),0,0}, @@ -330,6 +334,7 @@ static SYMBOL symbols[] = { { "SHUTDOWN", SYM(SHUTDOWN),0,0}, { "SLAVE", SYM(SLAVE),0,0}, { "SMALLINT", SYM(SMALLINT),0,0}, + { "SOME", SYM(ANY_SYM),0,0}, { "SONAME", SYM(UDF_SONAME_SYM),0,0}, { "SPATIAL", SYM(SPATIAL_SYM),0,0}, { "SQL_BIG_RESULT", SYM(SQL_BIG_RESULT),0,0}, @@ -338,7 +343,7 @@ static SYMBOL symbols[] = { { "SQL_CALC_FOUND_ROWS", SYM(SQL_CALC_FOUND_ROWS),0,0}, { "SQL_NO_CACHE", SYM(SQL_NO_CACHE_SYM), 0, 0}, { "SQL_SMALL_RESULT", SYM(SQL_SMALL_RESULT),0,0}, - { "SQL_THREAD", SYM(SQL_THREAD),0,0}, + { "SQL_THREAD", SYM(SQL_THREAD),0,0}, { "SSL", SYM(SSL_SYM),0,0}, { "STRAIGHT_JOIN", SYM(STRAIGHT_JOIN),0,0}, { "START", SYM(START_SYM),0,0}, @@ -417,7 +422,9 @@ static SYMBOL sql_functions[] = { { "BIT_OR", SYM(BIT_OR),0,0}, { "BIT_AND", SYM(BIT_AND),0,0}, { "CAST", SYM(CAST_SYM),0,0}, + { "CEIL", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_ceiling)}, { "CEILING", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_ceiling)}, + { "CURRENT_USER", SYM(USER),0,0}, { "BIT_LENGTH", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_bit_length)}, { "CENTROID", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_centroid)}, { "CHAR_LENGTH", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_char_length)}, |