summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-08-11 10:27:19 +0200
committerunknown <serg@serg.mylan>2004-08-11 10:27:19 +0200
commit6c8a4a0e40cf005ad7ccaa4abc4bb852c4e5b592 (patch)
tree36fd6b2bdf589a3205fc1bad3e12f0d23d672d0b /sql/sql_yacc.yy
parented4ca325a9266860d8e85710eb200946ce47b080 (diff)
downloadmariadb-git-6c8a4a0e40cf005ad7ccaa4abc4bb852c4e5b592.tar.gz
allow get_format(TIMESTAMP, ...) syntax
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r--sql/sql_yacc.yy11
1 files changed, 7 insertions, 4 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 5d6ca5d5de5..8e3fb0884a9 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -3533,12 +3533,15 @@ interval:
| SECOND_MICROSECOND_SYM { $$=INTERVAL_SECOND_MICROSECOND; }
| SECOND_SYM { $$=INTERVAL_SECOND; }
| YEAR_MONTH_SYM { $$=INTERVAL_YEAR_MONTH; }
- | YEAR_SYM { $$=INTERVAL_YEAR; };
+ | YEAR_SYM { $$=INTERVAL_YEAR; }
+ ;
date_time_type:
- DATE_SYM {$$=MYSQL_TIMESTAMP_DATE;}
- | TIME_SYM {$$=MYSQL_TIMESTAMP_TIME;}
- | DATETIME {$$=MYSQL_TIMESTAMP_DATETIME;};
+ DATE_SYM {$$=MYSQL_TIMESTAMP_DATE;}
+ | TIME_SYM {$$=MYSQL_TIMESTAMP_TIME;}
+ | DATETIME {$$=MYSQL_TIMESTAMP_DATETIME;}
+ | TIMESTAMP {$$=MYSQL_TIMESTAMP_DATETIME;}
+ ;
table_alias:
/* empty */