summaryrefslogtreecommitdiff
path: root/sql/lex.h
diff options
context:
space:
mode:
authorgluh@gluh.mysql.r18.ru <>2003-12-08 14:41:41 +0400
committergluh@gluh.mysql.r18.ru <>2003-12-08 14:41:41 +0400
commitec8749249a65870b238707de8c0bc9f71faf0641 (patch)
tree9c147b6d7fd7bc40e51a59e4315562f59ccbcde0 /sql/lex.h
parente8634f80bde84993c16043342742077ca2904881 (diff)
downloadmariadb-git-ec8749249a65870b238707de8c0bc9f71faf0641.tar.gz
WL#530&531: TIMESTAMPADD, TIMESTAMPDIFF functions
Syntax for TIMESTAMPADD: TIMESTAMPADD(interval, integer_expression, datetime_expression) interval:= FRAC_SECOND | SECOND | MINUTE | HOUR | DAY | WEEK | MONTH | QUARTER | YEAR Supported SQL_TSI_ prefix (like SQL_TSI_SECOND) Syntax for TIMESTAMPDIFF: TIMESTAMPDIFF(interval, datetime_expression1, datetime_expression2) interval:= FRAC_SECOND | SECOND | MINUTE | HOUR | DAY | WEEK | MONTH | QUARTER | YEAR Supported SQL_TSI_ prefix (like SQL_TSI_SECOND)
Diffstat (limited to 'sql/lex.h')
-rw-r--r--sql/lex.h16
1 files changed, 14 insertions, 2 deletions
diff --git a/sql/lex.h b/sql/lex.h
index a5830ac8620..87f3b582276 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -176,6 +176,7 @@ static SYMBOL symbols[] = {
{ "FOREIGN", SYM(FOREIGN),0,0},
{ "FORCE", SYM(FORCE_SYM),0,0},
{ "FOUND", SYM(FOUND_SYM),0,0},
+ { "FRAC_SECOND", SYM(FRAC_SECOND_SYM),0,0},
{ "RAID_TYPE", SYM(RAID_TYPE),0,0},
{ "RAID_CHUNKS", SYM(RAID_CHUNKS),0,0},
{ "RAID_CHUNKSIZE", SYM(RAID_CHUNKSIZE),0,0},
@@ -335,6 +336,7 @@ static SYMBOL symbols[] = {
{ "PROCESS" , SYM(PROCESS),0,0},
{ "PROCESSLIST", SYM(PROCESSLIST_SYM),0,0},
{ "PRIVILEGES", SYM(PRIVILEGES),0,0},
+ { "QUARTER", SYM(QUARTER_SYM),0,0},
{ "QUERY", SYM(QUERY_SYM),0,0},
{ "QUICK", SYM(QUICK),0,0},
{ "RAID0", SYM(RAID_0_SYM),0,0},
@@ -397,6 +399,15 @@ static SYMBOL symbols[] = {
{ "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_TSI_FRAC_SECOND", SYM(FRAC_SECOND_SYM),0,0},
+ { "SQL_TSI_SECOND", SYM(SECOND_SYM),0,0},
+ { "SQL_TSI_MINUTE", SYM(MINUTE_SYM),0,0},
+ { "SQL_TSI_HOUR", SYM(HOUR_SYM),0,0},
+ { "SQL_TSI_DAY", SYM(DAY_SYM),0,0},
+ { "SQL_TSI_WEEK", SYM(WEEK_SYM),0,0},
+ { "SQL_TSI_MONTH", SYM(MONTH_SYM),0,0},
+ { "SQL_TSI_QUARTER", SYM(QUARTER_SYM),0,0},
+ { "SQL_TSI_YEAR", SYM(YEAR_SYM),0,0},
{ "SOUNDS", SYM(SOUNDS_SYM),0,0},
{ "SSL", SYM(SSL_SYM),0,0},
{ "STRAIGHT_JOIN", SYM(STRAIGHT_JOIN),0,0},
@@ -416,6 +427,8 @@ static SYMBOL symbols[] = {
{ "THEN", SYM(THEN_SYM),0,0},
{ "TIME", SYM(TIME_SYM),0,0},
{ "TIMESTAMP", SYM(TIMESTAMP),0,0},
+ { "TIMESTAMPADD", SYM(TIMESTAMP_ADD),0,0},
+ { "TIMESTAMPDIFF", SYM(TIMESTAMP_DIFF),0,0},
{ "TINYBLOB", SYM(TINYBLOB),0,0},
{ "TINYTEXT", SYM(TINYTEXT),0,0},
{ "TINYINT", SYM(TINYINT),0,0},
@@ -451,6 +464,7 @@ static SYMBOL symbols[] = {
{ "VARYING", SYM(VARYING),0,0},
{ "VARBINARY", SYM(VARBINARY),0,0},
{ "WARNINGS", SYM(WARNINGS),0,0},
+ { "WEEK", SYM(WEEK_SYM),0,0},
{ "WITH", SYM(WITH),0,0},
{ "WORK", SYM(WORK_SYM),0,0},
{ "WRITE", SYM(WRITE_SYM),0,0},
@@ -637,7 +651,6 @@ static SYMBOL sql_functions[] = {
{ "POSITION", SYM(POSITION_SYM),0,0},
{ "POW", SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_pow)},
{ "POWER", SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_pow)},
- { "QUARTER", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_quarter)},
{ "QUOTE", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_quote)},
{ "RADIANS", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_radians)},
{ "RAND", SYM(RAND),0,0},
@@ -683,7 +696,6 @@ static SYMBOL sql_functions[] = {
{ "UPPER", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_ucase)},
{ "VARIANCE", SYM(VARIANCE_SYM),0,0},
{ "VERSION", SYM(FUNC_ARG0),0,CREATE_FUNC(create_func_version)},
- { "WEEK", SYM(WEEK_SYM),0,0},
{ "WEEKDAY", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_weekday)},
{ "WEEKOFYEAR", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_weekofyear)},
{ "WITHIN", SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_within)},