diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2011-09-13 15:19:55 +0500 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2011-09-13 15:19:55 +0500 |
| commit | b408b1bbbc87246df8e9728cec90ce215dc08ec2 (patch) | |
| tree | 314d133f333aee588b938dccb810554e192ac23f /sql/gcalc_slicescan.cc | |
| parent | 3882c5d62c83f4768c022f38bf91180ce0fcc7a2 (diff) | |
| download | mariadb-git-b408b1bbbc87246df8e9728cec90ce215dc08ec2.tar.gz | |
Fix for bug #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
That assertion's check was too tight. Released it a bit.
per-file comments:
mysql-test/r/gis-precise.result
Fix for bug #848901
test result updated.
mysql-test/t/gis-precise.test
Fix for bug #848901
test case added.
sql/gcalc_slicescan.cc
Fix for bug #848901
The DBUG_ASSERT check is too tight here.
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 607f55a5d3f..6f41a5fc371 100644 --- a/sql/gcalc_slicescan.cc +++ b/sql/gcalc_slicescan.cc @@ -950,7 +950,7 @@ int Gcalc_scan_iterator::intersection_scan() /* The superfluous intersection should be close to the current. */ DBUG_ASSERT(fabs(cur_isc->x-m_cur_intersection->x) + fabs(cur_isc->y-m_cur_intersection->y) < - INTERSECTION_ZERO); + 0.00000000001); isc->next= isc->next->next; free_item(cur_isc); } |