From 80fc93c9df00a622901391d4fdf3be339e5b24d1 Mon Sep 17 00:00:00 2001
From: Roman Nozdrin <drrtuy@gmail.com>
Date: Mon, 9 Jul 2018 18:36:28 +0300
Subject: [PATCH] MCOL-1510 GROUP BY supports aggregates as arguments in 
 numerical functions.

---
 dbcon/mysql/ha_calpont_execplan.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dbcon/mysql/ha_calpont_execplan.cpp b/dbcon/mysql/ha_calpont_execplan.cpp
index b06c197aa..a7c9cd7bf 100644
--- a/dbcon/mysql/ha_calpont_execplan.cpp
+++ b/dbcon/mysql/ha_calpont_execplan.cpp
@@ -3412,6 +3412,13 @@ ReturnedColumn* buildFunctionColumn(
 
                 ReturnedColumn* rc = buildReturnedColumn(ifp->arguments()[i], gwi, nonSupport);
 
+                // MCOL-1510 It must be a temp table field, so find the corresponding column.
+                if (pushdownHand 
+                    && ifp->arguments()[i]->type() == Item::REF_ITEM)
+                {
+                    rc = findCorrespTempField(static_cast<Item_ref*>(ifp->arguments()[i]), gwi);
+                }
+
                 if (!rc || nonSupport)
                 {
                     nonSupport = true;