From 5815c5c526a02216c5adc0f5c90379a76e5f8c17 Mon Sep 17 00:00:00 2001
From: Roman Nozdrin <roman.nozdrin@mariadb.com>
Date: Tue, 22 Dec 2020 15:43:51 +0000
Subject: [PATCH] MCOL-4452 RowAggregationUMP2::doUDAF() now calls
 setUserData() using a correct UDAF context

---
 utils/rowgroup/rowaggregation.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/utils/rowgroup/rowaggregation.cpp b/utils/rowgroup/rowaggregation.cpp
index f8e3cde03..48b2e434f 100755
--- a/utils/rowgroup/rowaggregation.cpp
+++ b/utils/rowgroup/rowaggregation.cpp
@@ -4627,13 +4627,14 @@ void RowAggregationUMP2::doUDAF(const Row& rowIn,
     // Call the UDAF subEvaluate method
     mcsv1sdk::mcsv1_UDAF::ReturnCode rc;
     rc = udafContextsColl[funcColsIdx].getFunction()->subEvaluate(&udafContextsColl[funcColsIdx], userDataIn.get());
-    fRGContext.setUserData(NULL);
+    udafContextsColl[funcColsIdx].setUserData(NULL);
 
     if (rc == mcsv1sdk::mcsv1_UDAF::ERROR)
     {
         RowUDAFFunctionCol* rowUDAF = dynamic_cast<RowUDAFFunctionCol*>(fFunctionCols[funcColsIdx].get());
         rowUDAF->bInterrupted = true;
-        throw logging::IDBExcept(fRGContext.getErrorMessage(), logging::aggregateFuncErr);
+        throw logging::IDBExcept(udafContextsColl[funcColsIdx].getErrorMessage(),
+                                 logging::aggregateFuncErr);
     }
 }