diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2020-03-18 13:55:21 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2020-03-18 13:55:21 +0400 |
| commit | a0ce62f804dc1a0073688bea46dc2e6728cf55e3 (patch) | |
| tree | be748f27c54e196a65e719a6299046b3b9e32478 /sql/spatial.h | |
| parent | 09e8707d90a8a73887fd4f22b64df43ff4669556 (diff) | |
| download | mariadb-git-a0ce62f804dc1a0073688bea46dc2e6728cf55e3.tar.gz | |
MDEV-14057 InnoDB GIS tests fail.
Tests fixed.
MBR::Within() function fixed.
Diffstat (limited to 'sql/spatial.h')
| -rw-r--r-- | sql/spatial.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sql/spatial.h b/sql/spatial.h index 76dbd06fdf4..e78da6e615d 100644 --- a/sql/spatial.h +++ b/sql/spatial.h @@ -145,12 +145,7 @@ struct MBR (mbr->xmax >= xmin && mbr->xmax <= xmax))); } - int within(const MBR *mbr) - { - /* The following should be safe, even if we compare doubles */ - return ((mbr->xmin <= xmin) && (mbr->ymin <= ymin) && - (mbr->xmax >= xmax) && (mbr->ymax >= ymax)); - } + int within(const MBR *mbr); int contains(const MBR *mbr) { |