diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-12-02 15:50:35 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-12-02 15:50:35 +0400 |
| commit | 5a8bd446adf3d1a53b8bc4dd88b3830bf0270865 (patch) | |
| tree | 1c5fa5001e8d82bf01b4bbc2e7c5703499342656 /sql/sql_time.h | |
| parent | 87355a453d4661a75f3b451b30b1867910915675 (diff) | |
| parent | b97b9536c71b3ad5ef521a1f21c527057a0a01c6 (diff) | |
| download | mariadb-git-5a8bd446adf3d1a53b8bc4dd88b3830bf0270865.tar.gz | |
Merge 5.3->5.5
pending merges:
Alexander Barkov 2013-12-02 MDEV-4857 Wrong result of HOUR('1 00:00:00')
Diffstat (limited to 'sql/sql_time.h')
| -rw-r--r-- | sql/sql_time.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_time.h b/sql/sql_time.h index f8b1e950b14..ab8f0e0b962 100644 --- a/sql/sql_time.h +++ b/sql/sql_time.h @@ -33,6 +33,7 @@ typedef struct st_known_date_time_format KNOWN_DATE_TIME_FORMAT; ulong convert_period_to_month(ulong period); ulong convert_month_to_period(ulong month); +void time_to_daytime_interval(MYSQL_TIME *l_time); bool get_date_from_daynr(long daynr,uint *year, uint *month, uint *day); my_time_t TIME_to_timestamp(THD *thd, const MYSQL_TIME *t, uint *error_code); bool str_to_time_with_warn(CHARSET_INFO *cs, const char *str, uint length, |