mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge polly.(none):/home/kaa/src/maint/bug30453/my51-bug28878
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
This commit is contained in:
@ -1561,14 +1561,18 @@ my_strntoull10rnd_8bit(CHARSET_INFO *cs __attribute__((unused)),
|
||||
}
|
||||
else
|
||||
addon= (*str >= '5');
|
||||
for ( ; str < end && (ch= (uchar) (*str - '0')) < 10; str++)
|
||||
if (!dot)
|
||||
{
|
||||
if (!dot)
|
||||
shift++;
|
||||
for ( ; str < end && (ch= (uchar) (*str - '0')) < 10; shift++, str++);
|
||||
if (str < end && *str == '.')
|
||||
{
|
||||
str++;
|
||||
for ( ; str < end && (ch= (uchar) (*str - '0')) < 10; str++);
|
||||
}
|
||||
}
|
||||
if (str < end && *str == '.' && !dot)
|
||||
else
|
||||
{
|
||||
str++;
|
||||
shift= dot - str;
|
||||
for ( ; str < end && (ch= (uchar) (*str - '0')) < 10; str++);
|
||||
}
|
||||
goto exp;
|
||||
|
Reference in New Issue
Block a user