diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2011-09-05 09:13:58 +0500 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2011-09-05 09:13:58 +0500 |
| commit | 97eae1cd63e3bb05c98a4b050ec3abaf7925c382 (patch) | |
| tree | 7c341805ddb2d21fbe4200d1b33643872d2239ba /sql/item_geofunc.cc | |
| parent | 6dfa30e938babc2cac59f2d5eac1f4d46a361b93 (diff) | |
| download | mariadb-git-97eae1cd63e3bb05c98a4b050ec3abaf7925c382.tar.gz | |
bug 839318 Crash in Gcalc_scan_iterator::point::get_shape with ST_DISTANCE and MULTILINESTRING in maria-5.3-gis.
wrong variable was used as a result of inattentive copypaste.
per-file comments:
mysql-test/r/gis-precise.result
bug 839318 Crash in Gcalc_scan_iterator::point::get_shape with ST_DISTANCE and MULTILINESTRING in maria-5.3-gis.
test result updated.
mysql-test/t/gis-precise.test
bug 839318 Crash in Gcalc_scan_iterator::point::get_shape with ST_DISTANCE and MULTILINESTRING in maria-5.3-gis.
test case added.
sql/item_geofunc.cc
bug 839318 Crash in Gcalc_scan_iterator::point::get_shape with ST_DISTANCE and MULTILINESTRING in maria-5.3-gis.
use 'ev' variable instead of the 'evpos'.
Diffstat (limited to 'sql/item_geofunc.cc')
| -rw-r--r-- | sql/item_geofunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index a8abcd26b42..ea849bb10a3 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -1829,7 +1829,7 @@ double Item_func_distance::val_real() { if (ev->event != scev_intersection) cur_point= ev->pi; - func.set_on_state(evpos->get_shape()); + func.set_on_state(ev->get_shape()); if (func.count()) { /* Point of one object is inside the other - intersection found */ |