diff options
| author | unknown <sanja@montyprogram.com> | 2012-09-06 00:14:33 +0300 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2012-09-06 00:14:33 +0300 |
| commit | caedd1992c0926f41e3fb5f8b6f430d9a2a827a9 (patch) | |
| tree | 608480bb375937718737c67d12dd3ec0edca303a /sql/item_geofunc.cc | |
| parent | 24b9d7e43f8251263863f52bfefb00eacf2523ae (diff) | |
| parent | 54bb28d4a151d0eb5c3b74edb40ddf6e118c124b (diff) | |
| download | mariadb-git-caedd1992c0926f41e3fb5f8b6f430d9a2a827a9.tar.gz | |
merge 5.3->5.5
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 3648b10af3f..bc89a6c14b3 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -1695,7 +1695,8 @@ count_distance: for (dist_point= collector.get_first(); dist_point; dist_point= dist_point->get_next()) { /* We only check vertices of object 2 */ - if (dist_point->shape < obj2_si) + if (dist_point->type != Gcalc_heap::nt_shape_node || + dist_point->shape < obj2_si) continue; /* if we have an edge to check */ |