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

Revert "MCOL-3518 Set number of decimals for regr_avgx and regr_avgy in init."

Browse Source 
This reverts commit c5cc5f20c9.
This commit is contained in:
David Hall
2019-10-16 10:08:47 -05:00
parent 9c97a794f2
commit d0bb6fddbc
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils/regr/regrmysql.cpp
View File

@ -167,10 +167,14 @@ extern "C"
strcpy(message,"regr_avgx() with a non-numeric independant (second) argument"); strcpy(message,"regr_avgx() with a non-numeric independant (second) argument");
return 1; return 1;
} }
if (initid->decimals != DECIMAL_NOT_SPECIFIED) if (args->arg_type[1] == DECIMAL_RESULT && initid->decimals != DECIMAL_NOT_SPECIFIED)
{ {
initid->decimals += 4; initid->decimals += 4;
} }
else
{
initid->decimals = DECIMAL_NOT_SPECIFIED;
}
if (!(data = (struct regr_avgx_data*) malloc(sizeof(struct regr_avgx_data)))) if (!(data = (struct regr_avgx_data*) malloc(sizeof(struct regr_avgx_data))))
{ {
@ -271,10 +275,14 @@ extern "C"
return 1; return 1;
} }
if (initid->decimals != DECIMAL_NOT_SPECIFIED) if (args->arg_type[0] == DECIMAL_RESULT && initid->decimals != DECIMAL_NOT_SPECIFIED)
{ {
initid->decimals += 4; initid->decimals += 4;
} }
else
{
initid->decimals = DECIMAL_NOT_SPECIFIED;
}
if (!(data = (struct regr_avgy_data*) malloc(sizeof(struct regr_avgy_data)))) if (!(data = (struct regr_avgy_data*) malloc(sizeof(struct regr_avgy_data))))
{ {