From e61583c81b2875aaf3d51d5a054859a4d9192eb4 Mon Sep 17 00:00:00 2001
From: Leonid Fedorov <leonid.fedorov@mariadb.com>
Date: Tue, 15 Jul 2025 22:28:28 +0000
Subject: [PATCH] std::sqrt

---
 utils/regr/corr.cpp      |  5 +++--
 utils/regr/regr_r2.cpp   | 10 +++-------
 utils/regr/regrmysql.cpp | 10 ++++------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/utils/regr/corr.cpp b/utils/regr/corr.cpp
index 3f53e62a6..c63813c65 100644
--- a/utils/regr/corr.cpp
+++ b/utils/regr/corr.cpp
@@ -15,6 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
+#include <cmath>
 #include <cstring>
 #include "corr.h"
 
@@ -193,8 +194,8 @@ mcsv1_UDAF::ReturnCode corr::evaluate(mcsv1Context* context, static_any::any& va
       // When var_popy is 0, NULL is the result
       return mcsv1_UDAF::SUCCESS;
     }
-    long double std_popx = sqrt(var_popx);
-    long double std_popy = sqrt(var_popy);
+    long double std_popx = std::sqrt(var_popx);
+    long double std_popy = std::sqrt(var_popy);
     long double corr = cxy / (std_popy * std_popx * N);
     valOut = static_cast<double>(corr);
   }
diff --git a/utils/regr/regr_r2.cpp b/utils/regr/regr_r2.cpp
index 313c43d38..a1b0e86ca 100644
--- a/utils/regr/regr_r2.cpp
+++ b/utils/regr/regr_r2.cpp
@@ -15,13 +15,9 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#include <sstream>
 #include <cstring>
-#include <typeinfo>
 #include "regr_r2.h"
-#include "bytestream.h"
-#include "objectreader.h"
-
+#include <cmath>
 using namespace mcsv1sdk;
 
 class Add_regr_r2_ToUDAFMap
@@ -197,8 +193,8 @@ mcsv1_UDAF::ReturnCode regr_r2::evaluate(mcsv1Context* context, static_any::any&
       valOut = 1.0;
       return mcsv1_UDAF::SUCCESS;
     }
-    long double std_popx = sqrt(var_popx);
-    long double std_popy = sqrt(var_popy);
+    long double std_popx = std::sqrt(var_popx);
+    long double std_popy = std::sqrt(var_popy);
     long double corr = cxy / (std_popy * std_popx * N);
     valOut = static_cast<double>(corr * corr);
   }
diff --git a/utils/regr/regrmysql.cpp b/utils/regr/regrmysql.cpp
index 1f767acbf..9020e81fa 100644
--- a/utils/regr/regrmysql.cpp
+++ b/utils/regr/regrmysql.cpp
@@ -1,7 +1,5 @@
 #include <my_config.h>
 #include <cmath>
-#include <iostream>
-#include <sstream>
 #include <string.h>
 
 #include "idb_mysql.h"
@@ -597,8 +595,8 @@ extern "C"
         // When var_popy is 0, 1 is the result
         return 1;
       }
-      long double std_popx = sqrt(var_popx);
-      long double std_popy = sqrt(var_popy);
+      long double std_popx = std::sqrt(var_popx);
+      long double std_popy = std::sqrt(var_popy);
       long double covar_pop = (sumxy - ((sumx * sumy) / N)) / N;
       long double corr = covar_pop / (std_popy * std_popx);
       valOut = static_cast<double>(corr * corr);
@@ -717,8 +715,8 @@ extern "C"
         // When var_popy is 0, 1 is the result
         return 1;
       }
-      long double std_popx = sqrt(var_popx);
-      long double std_popy = sqrt(var_popy);
+      long double std_popx = std::sqrt(var_popx);
+      long double std_popy = std::sqrt(var_popy);
       long double covar_pop = (sumxy - ((sumx * sumy) / N)) / N;
       long double corr = covar_pop / (std_popy * std_popx);
       return static_cast<double>(corr);