diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-21 12:54:56 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-21 12:54:56 +0200 |
| commit | 59d51f0c12d6f2bccc8354079be67c6e520d3675 (patch) | |
| tree | d4bf888eceb9434807dd4889fd04257d5bf5ad2b /sql-common/my_time.c | |
| parent | fb8bc59f0120fbd3517a291e71d81c3d11443baa (diff) | |
| parent | 4368efe870f225279106798f71978b68c473e2ab (diff) | |
| download | mariadb-git-59d51f0c12d6f2bccc8354079be67c6e520d3675.tar.gz | |
Merge branch '10.2' into bb-10.2-connector-c-integ-subm
Diffstat (limited to 'sql-common/my_time.c')
| -rw-r--r-- | sql-common/my_time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 450a0fca775..88f28e1d44a 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -224,7 +224,7 @@ my_bool check_datetime_range(const MYSQL_TIME *ltime) ltime->minute > 59 || ltime->second > 59 || ltime->second_part > TIME_MAX_SECOND_PART || (ltime->hour > - (ltime->time_type == MYSQL_TIMESTAMP_TIME ? TIME_MAX_HOUR : 23)); + (uint) (ltime->time_type == MYSQL_TIMESTAMP_TIME ? TIME_MAX_HOUR : 23)); } @@ -237,7 +237,7 @@ static void get_microseconds(ulong *val, MYSQL_TIME_STATUS *status, if (get_digits(&tmp, number_of_fields, str, end, 6)) status->warnings|= MYSQL_TIME_WARN_TRUNCATED; if ((status->precision= (*str - start)) < 6) - *val= tmp * log_10_int[6 - (*str - start)]; + *val= (ulong) (tmp * log_10_int[6 - (*str - start)]); else *val= tmp; if (skip_digits(str, end)) |