1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-27 21:01:50 +03:00

Merge branch 'develop-1.0' into develop-1.1-merge-up-20190214

This commit is contained in:
Andrew Hutchings
2019-02-14 14:15:07 +00:00

View File

@ -188,10 +188,17 @@ long long Convertor::convertDecimalString(
dval *= 10; dval *= 10;
// range check against int64 // range check against int64
if (dval > LLONG_MAX || dval < LLONG_MIN) if (dval > LLONG_MAX)
{
errno = ERANGE; errno = ERANGE;
else return LLONG_MAX;
errno = 0; }
if (dval < LLONG_MIN)
{
errno = ERANGE;
return LLONG_MIN;
}
errno = 0;
ret = dval; ret = dval;