diff options
| author | Monty <monty@mariadb.org> | 2016-08-23 15:03:31 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-08-23 15:03:31 +0300 |
| commit | 4da2b83af712492e4c3cb85e0005cde8511fa810 (patch) | |
| tree | 8bd98ff55c522d7a99b1ae94a8f84d18567c4ab4 /sql-common | |
| parent | a5051cd3b2a46eb01ef9afdb1d798bdf6db715ab (diff) | |
| download | mariadb-git-4da2b83af712492e4c3cb85e0005cde8511fa810.tar.gz | |
Fixed compiler error and some warnings on windows
Diffstat (limited to 'sql-common')
| -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 28757a2c96c..7cf8692a3f6 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)) |