diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-20 18:08:16 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-20 18:12:17 +0200 |
| commit | 44298e4dea39280187c587c6e776ce8d04e350de (patch) | |
| tree | 15f8bac3c985c4f07fd6af066439d046dbb13c35 /sql/spatial.h | |
| parent | dd68db0c17d674f1b64e70ff7ea9e3f4abe4ee3e (diff) | |
| parent | 9f7b8625e698da6b7eba7c26e765c66635571919 (diff) | |
| download | mariadb-git-44298e4dea39280187c587c6e776ce8d04e350de.tar.gz | |
Merge 10.2 into 10.3
Also, clean up the test innodb_gis.geometry a little further.
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 fa4e40b5aa5..55f450b1b1b 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) { |