diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2014-04-18 13:41:15 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2014-04-18 13:41:15 +0400 |
| commit | 1c6d508a2b9dd1dfaeb68b3443212b57190950d8 (patch) | |
| tree | 55284120225d0e51fbcc82abf411062b3e7bdfd9 /sql/sql_time.h | |
| parent | f7a47e137b18277db676c1e241d06664594208d1 (diff) | |
| parent | 8db600f951005b0b23b23dcd0ddd848303aa13ac (diff) | |
| download | mariadb-git-1c6d508a2b9dd1dfaeb68b3443212b57190950d8.tar.gz | |
Merge from 5.3
Diffstat (limited to 'sql/sql_time.h')
| -rw-r--r-- | sql/sql_time.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_time.h b/sql/sql_time.h index f9092769749..aa81edbc105 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); +bool time_to_datetime(MYSQL_TIME *ltime); 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); @@ -124,6 +125,8 @@ check_date(const MYSQL_TIME *ltime, ulonglong flags, int *was_cut) } bool check_date_with_warn(const MYSQL_TIME *ltime, ulonglong fuzzy_date, timestamp_type ts_type); +bool make_date_with_warn(MYSQL_TIME *ltime, + ulonglong fuzzy_date, timestamp_type ts_type); bool adjust_time_range_with_warn(MYSQL_TIME *ltime, uint dec); #endif /* SQL_TIME_INCLUDED */ |