diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-06-06 00:07:27 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-06-06 00:07:27 +0200 |
| commit | e27c338634739ef56a6888e7948e04c0fa0ba677 (patch) | |
| tree | ad63ccae614f3dd77509825d1905fd815ef322cb /include/my_time.h | |
| parent | 2a5905141a3c509a7c34c3d370fb146dbc1c965f (diff) | |
| parent | 6d75570e99fbf070cdbeefdfbcfc94d1c7b3ad1f (diff) | |
| download | mariadb-git-e27c338634739ef56a6888e7948e04c0fa0ba677.tar.gz | |
5.5.38 merge
Diffstat (limited to 'include/my_time.h')
| -rw-r--r-- | include/my_time.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_time.h b/include/my_time.h index 3c45d1d9235..557dcdd5670 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -125,7 +125,7 @@ longlong double_to_datetime(double nr, MYSQL_TIME *ltime, uint flags, int *cut) ltime, flags, cut); } -int number_to_time(my_bool neg, longlong nr, ulong sec_part, +int number_to_time(my_bool neg, ulonglong nr, ulong sec_part, MYSQL_TIME *ltime, int *was_cut); ulonglong TIME_to_ulonglong_datetime(const MYSQL_TIME *); ulonglong TIME_to_ulonglong_date(const MYSQL_TIME *); |