summaryrefslogtreecommitdiff
path: root/sql/lex.h
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2002-11-24 15:47:19 +0200
committermonty@mashka.mysql.fi <>2002-11-24 15:47:19 +0200
commitdfb60ca085104981a35f2ba72fa30a01b1befa07 (patch)
treeed4766483373d3e3ccd10186eea178ace4e50ae4 /sql/lex.h
parente60050c4dd652c7a431aebeb95b7dd944be87bf8 (diff)
downloadmariadb-git-dfb60ca085104981a35f2ba72fa30a01b1befa07.tar.gz
Added new ANSI functions LOCALTIME, LOCALTIMESTAMP and CURRENT_USER
Added CEIL as an alias for CEILING Cleaned up CHECK constraint handling. (We don't anymore require braces after CHECK) Added casting to CHAR.
Diffstat (limited to 'sql/lex.h')
-rw-r--r--sql/lex.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h
index 49b6a3811e5..717e8a355ca 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -210,6 +210,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},
@@ -394,7 +396,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)},
{ "CHAR_LENGTH", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_char_length)},
{ "CHARACTER_LENGTH", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_char_length)},