diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2011-09-21 00:04:41 +0500 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2011-09-21 00:04:41 +0500 |
| commit | 0249413a6ae4a5900b51f434b361b9efa6133ad1 (patch) | |
| tree | ce34c73e2d9ad3d7b9d08612c35b65141b55821a /sql/item_geofunc.cc | |
| parent | 5a04ac7bf0ee359fb36f4ebc00f0aebc142d36b7 (diff) | |
| download | mariadb-git-0249413a6ae4a5900b51f434b361b9efa6133ad1.tar.gz | |
several bugs fixed here.
849789 Second assertion `m_poly_borders->next' failed in Gcalc_operation_reducer::count_slice in maria-5.3-gis
849791 Fourth assertion `n > 0 && n < SINUSES_CALCULATED*2+1' in get_n_sincos
849789 Second assertion `m_poly_borders->next' failed in Gcalc_operation_reducer::count_slice in maria-5.3-gis
848901 Assertion `fabs(cur_isc->x-m_cur_intersection->x) + fabs(cur_isc->y-m_cur_intersection->y) < 0.000000000001' failed in Gcalc_scan_iterator::intersection_scan() in maria-5.3-gis
per-file comments:
mysql-test/r/gis-precise.result
test result updated.
mysql-test/r/gis.result
test result updated.
sql/gcalc_slicescan.cc
bugfixes.
sql/gcalc_slicescan.h
bugfixes.
sql/gcalc_tools.cc
bugfixes.
sql/gcalc_tools.h
bugfixes.
sql/item_geofunc.cc
bugfixes.
sql/spatial.cc
bugfixes.
Diffstat (limited to 'sql/item_geofunc.cc')
| -rw-r--r-- | sql/item_geofunc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index 631b63812b5..2c3facb49c8 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -867,7 +867,8 @@ int Item_func_spatial_rel::func_touches() if (cur_func) { area= scan_it.get_h() * - ((ti.rb()->x - ti.lb()->x) + (ti.rt()->x - ti.lt()->x)); + ((scan_it.get_sp_x(ti.rb()) - scan_it.get_sp_x(ti.lb())) + + (scan_it.get_sp_x(ti.rt()) - scan_it.get_sp_x(ti.lt()))); if (area > GIS_ZERO) { result= 0; |