diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2016-12-05 17:01:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-05 17:01:28 +0200 |
| commit | 660521a43ac9f9f9f5850270168317b586bcbf43 (patch) | |
| tree | 341a4279a5ea1ab32155a1e4f6f9f8593ebfdf53 /storage/innobase/gis/gis0geo.cc | |
| parent | cc85ba8f2efdb48de65ac058b0a18edc5b80cf6a (diff) | |
| parent | b11eb36963793452128ebaa3a2f4057c4eca20f2 (diff) | |
| download | mariadb-git-660521a43ac9f9f9f5850270168317b586bcbf43.tar.gz | |
Merge pull request #263 from grooverdan/10.2-MDEV-11451-isfinite
MDEV-11451: isinf || isnan -> !isfinite
Diffstat (limited to 'storage/innobase/gis/gis0geo.cc')
| -rw-r--r-- | storage/innobase/gis/gis0geo.cc | 5 |
1 files changed, 3 insertions, 2 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; } |