diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2003-12-08 17:44:56 +0400 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2003-12-08 17:44:56 +0400 |
| commit | 8b915a43166e8aa914698a61a9079d3667452d65 (patch) | |
| tree | e1dea9912cd3f87479c480e067903430e3794de9 /sql/item_timefunc.cc | |
| parent | 4429ed7ec75c9a91a8171d2be66d0fe81544eb9f (diff) | |
| download | mariadb-git-8b915a43166e8aa914698a61a9079d3667452d65.tar.gz | |
post-merge fixes
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 66190371575..7936006acc4 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -1631,12 +1631,13 @@ longlong Item_date_add_interval::val_int() static const char *interval_names[]= { - "year", "month", "day", "hour", "minute", - "second", "microsecond", "year_month", - "day_hour", "day_minute", "day_second", - "hour_minute", "hour_second", "minute_second", - "day_microsecond", "hour_microsecond", - "minute_microsecond", "second_microsecond" + "year", "quarter", "month", "day", "hour", + "minute", "week", "second", "microsecond", + "year_month", "day_hour", "day_minute", + "day_second", "hour_minute", "hour_second", + "minute_second", "day_microsecond", + "hour_microsecond", "minute_microsecond", + "second_microsecond" }; void Item_date_add_interval::print(String *str) |