Merge pull request #263 from grooverdan/10.2-MDEV-11451-isfinite

MDEV-11451: isinf || isnan -> !isfinite

3 files changed, 6 insertions, 5 deletions

diff --git a/storage/innobase/gis/gis0geo.cc b/storage/innobase/gis/gis0geo.cc
index b90b47dc08c..436249c0026 100644
--- a/storage/innobase/gis/gis0geo.cc
+++ b/storage/innobase/gis/gis0geo.cc
@@ -364,8 +364,9 @@ mbr_join_square(
 		b += 2;
 	} while (a != end);
 
-	/* Check for infinity or NaN, so we don't get NaN in calculations */
-	if (my_isinf(square) || my_isnan(square)) {
+	/* Check if finite (not infinity or NaN),
+	so we don't get NaN in calculations */
+	if (!isfinite(square)) {
 		return DBL_MAX;
 	}
 
diff --git a/storage/innobase/gis/gis0rtree.cc b/storage/innobase/gis/gis0rtree.cc
index ee89e0a913f..9f8a3492db9 100644
--- a/storage/innobase/gis/gis0rtree.cc
+++ b/storage/innobase/gis/gis0rtree.cc
@@ -1988,7 +1988,7 @@ rtr_estimate_n_rows_in_range(
 	mtr_commit(&mtr);
 	mem_heap_free(heap);
 
-	if (my_isinf(area) || my_isnan(area)) {
+	if (!isfinite(area)) {
 		return(HA_POS_ERROR);
 	}
 
diff --git a/storage/myisam/rt_split.c b/storage/myisam/rt_split.c
index be61734e01c..73e3e85c30c 100644
--- a/storage/myisam/rt_split.c
+++ b/storage/myisam/rt_split.c
@@ -69,8 +69,8 @@ static double mbr_join_square(const double *a, const double *b, int n_dim)
     b += 2;
   }while (a != end);
 
-   /* Check for infinity or NaN */
-  if (my_isinf(square) || isnan(square))
+   /* Check if not finite (i.e. infinity or NaN) */
+  if (!isfinite(square))
     square = DBL_MAX;
 
   return square;