diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2011-09-21 09:29:37 +0500 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2011-09-21 09:29:37 +0500 |
| commit | 25b5019c34e717aff95bf405e7d5eb15c2bedf75 (patch) | |
| tree | 8bb2999f4be55900e1867c61973614f05bfff80b /sql/gcalc_slicescan.cc | |
| parent | 0249413a6ae4a5900b51f434b361b9efa6133ad1 (diff) | |
| download | mariadb-git-25b5019c34e717aff95bf405e7d5eb15c2bedf75.tar.gz | |
bugs fixed
855253 Compiler error: gcalc_slicescan.cc:2036: error: suggest parentheses around comparison in operand of .|. in maria-5.3-gis
850775 ST_AREA does not work on GEOMETRYCOLLECTIONs in maria-5.3-gis
per-file comments:
mysql-test/r/gis.result
test result updated.
mysql-test/t/gis.test
test case added for 850775.
sql/gcalc_slicescan.cc
compiler error fixed.
sql/spatial.cc
ST_AREA implementation for GEOMETRY_COLLECTION, POINT and LINESTRING.
sql/spatial.h
area() declarations added.
Diffstat (limited to 'sql/gcalc_slicescan.cc')
| -rw-r--r-- | sql/gcalc_slicescan.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/gcalc_slicescan.cc b/sql/gcalc_slicescan.cc index 07120d2e87e..8a9fcc60ad0 100644 --- a/sql/gcalc_slicescan.cc +++ b/sql/gcalc_slicescan.cc @@ -2033,7 +2033,7 @@ double Gcalc_scan_iterator::get_h() const double Gcalc_scan_iterator::get_sp_x(const point *sp) const { double dy; - if (sp->event == scev_end | scev_two_ends | scev_point) + if (sp->event & (scev_end | scev_two_ends | scev_point)) return sp->pi->x; dy= sp->next_pi->y - sp->pi->y; if (fabs(dy) < 1e-12) |