diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-21 11:37:10 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-21 11:37:10 +0200 |
| commit | 5203bc10f1f545131d01c253163ba06b6218be2c (patch) | |
| tree | bb28122ee8a279bd9ad9b0358ac131356a80a7e8 /sql/spatial.h | |
| parent | 76cdc1d73ec0215c91725a8507da7bda416c52ec (diff) | |
| parent | 9394cc89143e4fce3126a96ac1c8a91a66d71dea (diff) | |
| download | mariadb-git-5203bc10f1f545131d01c253163ba06b6218be2c.tar.gz | |
Merge 10.4 into 10.5
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 7817fd041cd..0b998e2e55c 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) { |