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

Merge pull request #911 from dhall-MariaDB/MCOL-3518

Browse Source 
Mcol 3518
This commit is contained in:
Roman Nozdrin
2019-10-17 10:53:25 +03:00
committed by GitHub
parent 2fad6a4ed3 6630df3cb2
commit c0a5b2bc4d
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils/regr/regrmysql.cpp
View File

@@ -167,14 +167,10 @@ 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 (args->arg_type[1] == DECIMAL_RESULT && initid->decimals != DECIMAL_NOT_SPECIFIED) if (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))))
{ {
@@ -275,14 +271,10 @@ extern "C"
return 1; return 1;
} }
if (args->arg_type[0] == DECIMAL_RESULT && initid->decimals != DECIMAL_NOT_SPECIFIED) if (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))))
{ {