diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-28 15:23:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-28 15:23:21 +0300 |
| commit | 5f35e103ee667b8596efbd138819af8dedd93ed5 (patch) | |
| tree | c01e53829e93076958e2c5f625b5bc34f33c12b3 /include/my_time.h | |
| parent | 9cd6e7ad73554be6d0186a42f983777a90a984f1 (diff) | |
| parent | 4ba20e0a14b9134a7e71aa4b592522967456317c (diff) | |
| download | mariadb-git-5f35e103ee667b8596efbd138819af8dedd93ed5.tar.gz | |
Merge 10.1 into 10.2
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 80089fa2c64..eeb790cdb54 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -120,7 +120,7 @@ longlong number_to_datetime(longlong nr, ulong sec_part, MYSQL_TIME *time_res, static inline longlong double_to_datetime(double nr, MYSQL_TIME *ltime, uint flags, int *cut) { - if (nr < 0 || nr > LONGLONG_MAX) + if (nr < 0 || nr > (double)LONGLONG_MAX) nr= (double)LONGLONG_MAX; return number_to_datetime((longlong) floor(nr), (ulong)((nr-floor(nr))*TIME_SECOND_PART_FACTOR), |