database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

Merge pull request #1012 from dhall-MariaDB/MCOL-3662

Browse Source 
MCOL-3662 Restore error message for multi parameter aggregates save for UDAnF and GROUP_CONCAT
This commit is contained in:
Gagan Goel
2020-01-31 13:43:28 -05:00
committed by Patrick LeBlanc
parent 42adfb60e5
commit f27cb8a21f
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dbcon/mysql/ha_mcs_execplan.cpp
View File

@ -4564,10 +4564,9 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
if (gwi.clauseType == SELECT) if (gwi.clauseType == SELECT)
gwi.aggOnSelect = true; gwi.aggOnSelect = true;
// N.B. argument_count() is the # of formal parms to the agg fcn. InifniDB only supports 1 argument // Argument_count() is the # of formal parms to the agg fcn. Columnstore
// TODO: Support more than one parm // only supports 1 argument except UDAnF and GROUP_CONCAT
#if 0 // TODO: Support more than one parm for COUNT(DISTINCT)
if (isp->argument_count() != 1 && isp->sum_func() != Item_sum::GROUP_CONCAT_FUNC if (isp->argument_count() != 1 && isp->sum_func() != Item_sum::GROUP_CONCAT_FUNC
&& isp->sum_func() != Item_sum::UDF_SUM_FUNC) && isp->sum_func() != Item_sum::UDF_SUM_FUNC)
{ {
@ -4576,7 +4575,6 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
return NULL; return NULL;
} }
#endif
AggregateColumn* ac = NULL; AggregateColumn* ac = NULL;
if (isp->sum_func() == Item_sum::GROUP_CONCAT_FUNC) if (isp->sum_func() == Item_sum::GROUP_CONCAT_FUNC)