From 8baf0590a49f58a439016bb77c7c40c2e6a8278a Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Fri, 31 Mar 2017 21:47:12 +0100 Subject: [PATCH] MCOL-653 Revert SUM(1) behaviour SUM(1) behaviour was changed as part of MCOL-301. But the original behaviour was correct. --- dbcon/mysql/ha_calpont_execplan.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dbcon/mysql/ha_calpont_execplan.cpp b/dbcon/mysql/ha_calpont_execplan.cpp index 945fd817e..4c2f7959b 100755 --- a/dbcon/mysql/ha_calpont_execplan.cpp +++ b/dbcon/mysql/ha_calpont_execplan.cpp @@ -3563,10 +3563,6 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi) if (ac->aggOp() == AggregateColumn::COUNT) ac->aggOp(AggregateColumn::COUNT_ASTERISK); - // MCOL-301: treat SUM(1) as MAX(1) to get constant result - if (ac->aggOp() == AggregateColumn::SUM) - ac->aggOp(AggregateColumn::MAX); - ac->constCol(SRCP(buildReturnedColumn(sfitemp, gwi, gwi.fatalParseError))); break; } @@ -3605,10 +3601,6 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi) ReturnedColumn* rc = buildReturnedColumn(sfitemp, gwi, gwi.fatalParseError); if (dynamic_cast(rc)) { - // MCOL-301: treat SUM(1) as MAX(1) to get constant result - if (ac->aggOp() == AggregateColumn::SUM) - ac->aggOp(AggregateColumn::MAX); - //@bug5229. handle constant function on aggregate argument ac->constCol(SRCP(rc)); break;