From 86ebce7b3998cfe438cd71d04a1f1c5ae56127e7 Mon Sep 17 00:00:00 2001
From: David Hall <david.hall@mariadb.com>
Date: Mon, 10 Dec 2018 11:42:01 -0600
Subject: [PATCH] MCOL-1981 regr_avgx and regr_avgy should return NULL if count
 is zero

---
 utils/regr/regr_avgx.cpp | 6 +-----
 utils/regr/regr_avgy.cpp | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/utils/regr/regr_avgx.cpp b/utils/regr/regr_avgx.cpp
index 2041647a5..c366f4e5a 100644
--- a/utils/regr/regr_avgx.cpp
+++ b/utils/regr/regr_avgx.cpp
@@ -123,11 +123,7 @@ mcsv1_UDAF::ReturnCode regr_avgx::evaluate(mcsv1Context* context, static_any::an
 {
     struct regr_avgx_data* data = (struct regr_avgx_data*)context->getUserData()->data;
 
-    if (data->cnt == 0)
-    {
-        valOut = 0;
-    }
-    else
+    if (data->cnt > 0)
     {
         valOut = data->sum / (double)data->cnt;
     }
diff --git a/utils/regr/regr_avgy.cpp b/utils/regr/regr_avgy.cpp
index 69c654acf..87a729263 100644
--- a/utils/regr/regr_avgy.cpp
+++ b/utils/regr/regr_avgy.cpp
@@ -121,11 +121,7 @@ mcsv1_UDAF::ReturnCode regr_avgy::evaluate(mcsv1Context* context, static_any::an
 {
     struct regr_avgy_data* data = (struct regr_avgy_data*)context->getUserData()->data;
 
-    if (data->cnt == 0)
-    {
-        valOut = 0;
-    }
-    else
+    if (data->cnt > 0)
     {
         valOut = data->sum / (double)data->cnt;
     }