From dca6ff48c1a26f8eab911f4ad246f56be5005fd7 Mon Sep 17 00:00:00 2001 From: Alexey Botchkov Date: Fri, 23 Sep 2011 15:25:48 +0500 Subject: fix for bug 857051 ST_EQUALS returns TRUE on two nonidentical MULTIPOINTs The 'single point' event was forgotten in the relation's calculation per-file comments: mysql-test/r/gis-precise.result fix for bug 857051 ST_EQUALS returns TRUE on two nonidentical MULTIPOINTs test result updated. mysql-test/t/gis-precise.test fix for bug 857051 ST_EQUALS returns TRUE on two nonidentical MULTIPOINTs test case added. sql/gcalc_tools.cc fix for bug 857051 ST_EQUALS returns TRUE on two nonidentical MULTIPOINTs scev_single_point is properly handled. --- sql/gcalc_tools.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sql/gcalc_tools.cc') diff --git a/sql/gcalc_tools.cc b/sql/gcalc_tools.cc index 6a2fdbccacb..4c56e5c58bd 100644 --- a/sql/gcalc_tools.cc +++ b/sql/gcalc_tools.cc @@ -293,6 +293,7 @@ int Gcalc_function::check_function(Gcalc_scan_iterator &scan_it) gcalc_shape_info si= events->get_shape(); if (events->event == scev_thread || events->event == scev_end || + events->event == scev_single_point || (get_shape_kind(si) == Gcalc_function::shape_polygon)) set_b_state(si); else if (get_shape_kind(si) == Gcalc_function::shape_line) @@ -308,6 +309,7 @@ int Gcalc_function::check_function(Gcalc_scan_iterator &scan_it) gcalc_shape_info si= events->get_shape(); if (events->event == scev_thread || events->event == scev_end || + events->event == scev_single_point || (get_shape_kind(si) == Gcalc_function::shape_polygon)) clear_b_state(si); else if (get_shape_kind(si) == Gcalc_function::shape_line) -- cgit v1.2.1