diff options
| author | unknown <hf@eagle.intranet.mysql.r18.ru> | 2006-01-21 18:50:06 +0400 |
|---|---|---|
| committer | unknown <hf@eagle.intranet.mysql.r18.ru> | 2006-01-21 18:50:06 +0400 |
| commit | 494bccf044edd91363bf4b296dbc0cbbdc4e4bf9 (patch) | |
| tree | ba57b634fbff540434a56e3ce0639c85ec0f82ea /sql/spatial.h | |
| parent | ff3079c8d0f27a54b55cb2685aa9fd1cb498bc1a (diff) | |
| parent | ffe11393c9ce64a064faa2b85d3fb78de9adc013 (diff) | |
| download | mariadb-git-494bccf044edd91363bf4b296dbc0cbbdc4e4bf9.tar.gz | |
Merging
mysql-test/ndb/ndbcluster.sh:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/func_math.test:
Auto merged
mysql-test/t/type_float.test:
Auto merged
sql/spatial.h:
Auto merged
mysql-test/r/type_float.result:
merging
sql/item_func.cc:
merging
Diffstat (limited to 'sql/spatial.h')
| -rw-r--r-- | sql/spatial.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/spatial.h b/sql/spatial.h index 4253689c078..527dc750bdc 100644 --- a/sql/spatial.h +++ b/sql/spatial.h @@ -142,7 +142,7 @@ struct MBR bool inner_point(double x, double y) const { /* The following should be safe, even if we compare doubles */ - return (xmin<x) && (xmax>x) && (ymin<y) && (ymax>x); + return (xmin<x) && (xmax>x) && (ymin<y) && (ymax>y); } int overlaps(const MBR *mbr) |