merge 5.0-bugteam -> 5.1-bugteam

This commit is contained in:
Georgi Kodinov 2010-02-26 15:16:46 +02:00
commit 318c2dd90d

View file

@ -876,7 +876,7 @@ static bool get_interval_info(const char *str,uint length,CHARSET_INFO *cs,
value= value*LL(10) + (longlong) (*str - '0');
if (transform_msec && i == count - 1) // microseconds always last
{
int msec_length= 6 - (int)(str - start);
int msec_length= 6 - (int) (str - start);
if (msec_length > 0)
value*= (long)log_10_int[msec_length];
}