diff options
author | Sergei Golubchik <sergii@pisem.net> | 2012-08-31 14:15:52 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-31 14:15:52 +0200 |
commit | 59408093d1add69dd4cd3d1674a73712528aed92 (patch) | |
tree | 85e7d74ddb7c0a74c6c434b9c3dacfe9b7ebe2a3 /sql/sql_time.h | |
parent | a1fd37b1fd5803188d3f8b44914cca459f6e622f (diff) | |
parent | 51e14492e9410718056b0c6d9d4dabd4a96e8070 (diff) | |
download | mariadb-git-59408093d1add69dd4cd3d1674a73712528aed92.tar.gz |
5.3 merge
Diffstat (limited to 'sql/sql_time.h')
-rw-r--r-- | sql/sql_time.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_time.h b/sql/sql_time.h index 026a15cb796..c1a75bb2ad3 100644 --- a/sql/sql_time.h +++ b/sql/sql_time.h @@ -33,7 +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 get_date_from_daynr(long daynr,uint *year, uint *month, uint *day); +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, MYSQL_TIME *l_time, ulonglong fuzzydate); |