database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Merge branch 'develop-1.2' into develop-merge-up-20190924-2

Browse Source
This commit is contained in:
Andrew Hutchings
2019-09-24 14:17:57 +01:00
parent 66d59a760d 622e5fac53
commit 70b3aa3159
25 changed files with 304 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
utils/funcexp/func_bitwise.cpp
View File

@ -94,10 +94,6 @@ bool getUIntValFromParm(
{
isNull = true;
}
else
{
value = 0;
}
}
break;
@ -111,9 +107,9 @@ bool getUIntValFromParm(
{
d.value = 0;
}
int64_t tmpval = d.value / helpers::power(d.scale);
int lefto = (d.value - tmpval * helpers::power(d.scale)) / helpers::power(d.scale - 1);
double dscale = d.scale;
int64_t tmpval = d.value / pow(10.0, dscale);
int lefto = (d.value - tmpval * pow(10.0, dscale)) / pow(10.0, dscale - 1);
if ( tmpval >= 0 && lefto > 4 )
tmpval++;