diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-08-19 00:10:21 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-08-19 00:10:21 +0300 |
| commit | 755e72a0f55b593cf930ae9bd69998f82b70d5cf (patch) | |
| tree | bf340fae8765f9d5f1e1ac543d2926bef0021e03 /sql/lex.h | |
| parent | 2901c3b8fa7d4095445c6ca2070367d2f61af2d1 (diff) | |
| parent | a7c82c5693110bfa744bd4cf481b02eaabb7a0aa (diff) | |
| download | mariadb-git-755e72a0f55b593cf930ae9bd69998f82b70d5cf.tar.gz | |
merge
configure.in:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h index 15d33e761ef..24bfe796cc0 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -405,6 +405,9 @@ static SYMBOL symbols[] = { { "USE_FRM", SYM(USE_FRM),0,0}, { "USER", SYM(USER),0,0}, { "USING", SYM(USING),0,0}, + { "UTC_DATE", SYM(UTC_DATE_SYM),0,0}, + { "UTC_TIME", SYM(UTC_TIME_SYM),0,0}, + { "UTC_TIMESTAMP", SYM(UTC_TIMESTAMP_SYM),0,0}, { "UPDATE", SYM(UPDATE_SYM),0,0}, { "USAGE", SYM(USAGE),0,0}, { "VALUE", SYM(VALUE_SYM),0,0}, |