database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-24 22:42:05 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Andrew Hutchings
2019-02-14 14:15:07 +00:00
parent 738e778719 4e04d5e16b
commit 159df155a7
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
writeengine/shared/we_convertor.cpp
View File

@ -182,19 +182,26 @@ long long Convertor::convertDecimalString(
{
long double dval = strtold(field, NULL);
long long ret = 0;
// move scale digits to the left of the decimal point
for (int i = 0; i < scale; i++)
dval *= 10;
// range check against int64
if (dval > LLONG_MAX || dval < LLONG_MIN)
if (dval > LLONG_MAX)
{
errno = ERANGE;
else
errno = 0;
return LLONG_MAX;
}
if (dval < LLONG_MIN)
{
errno = ERANGE;
return LLONG_MIN;
}
errno = 0;
ret = dval;
// get the fractional part of what's left & round ret up or down.
dval -= ret;
if (dval >= 0.5 && ret < LLONG_MAX)