diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2017-11-07 00:37:49 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2017-11-07 00:37:49 +0300 |
| commit | d8d725101992d50b00edf149e7ccd7f720b850dc (patch) | |
| tree | 5797a3c9af2d2db487ec77093608f89b7dabe62f /sql/sql_time.h | |
| parent | 835cbbcc7b797188a89671019f2b2844e1a14e0c (diff) | |
| parent | ce66d5b2a53d76d286e8443807c4ebd7743cc354 (diff) | |
| download | mariadb-git-d8d725101992d50b00edf149e7ccd7f720b850dc.tar.gz | |
System Versioning pre0.12
Merge remote-tracking branch 'origin/archive/2017-10-17' into 10.3
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 1832e4501ed..28a2e2f50d2 100644 --- a/sql/sql_time.h +++ b/sql/sql_time.h @@ -170,6 +170,7 @@ bool calc_time_diff(const MYSQL_TIME *l_time1, const MYSQL_TIME *l_time2, int lsign, MYSQL_TIME *l_time3, ulonglong fuzzydate); int my_time_compare(const MYSQL_TIME *a, const MYSQL_TIME *b); void localtime_to_TIME(MYSQL_TIME *to, struct tm *from); + void calc_time_from_sec(MYSQL_TIME *to, long seconds, long microseconds); uint calc_week(MYSQL_TIME *l_time, uint week_behaviour, uint *year); |