database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-03-21 11:37:10 +02:00
parent 76cdc1d73e 9394cc8914
commit 5203bc10f1
93 changed files with 3016 additions and 2903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/spatial.h
View File

@ -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)
{