From cc70726a33976cb8069e7bd9f5fdf0a37573bf12 Mon Sep 17 00:00:00 2001
From: David Hall <david.hall@mariadb.com>
Date: Thu, 13 Dec 2018 15:49:11 -0600
Subject: [PATCH] MCOL-1983 For MCOL-1676 the reset of fValOut to NULL happens
 too soon.

---
 utils/windowfunction/wf_udaf.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/windowfunction/wf_udaf.cpp b/utils/windowfunction/wf_udaf.cpp
index 5986c2872..91ae5f9b2 100644
--- a/utils/windowfunction/wf_udaf.cpp
+++ b/utils/windowfunction/wf_udaf.cpp
@@ -708,12 +708,12 @@ void WF_udaf::operator()(int64_t b, int64_t e, int64_t c)
     mcsv1sdk::mcsv1_UDAF::ReturnCode rc;
     uint64_t colOut = fFieldIndex[0];
     bool isNull = false;
-    fValOut.reset();
 
     if ((fFrameUnit == WF__FRAME_ROWS) ||
             (fPrev == -1) ||
             (!fPeer->operator()(getPointer(fRowData->at(c)), getPointer(fRowData->at(fPrev)))))
     {
+        fValOut.reset();
         // for unbounded - current row special handling
         if (fPrev >= b && fPrev < c)
             b = c;