diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2011-09-23 15:36:56 +0500 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2011-09-23 15:36:56 +0500 |
| commit | 5b83aee35dffff0de4758a2a595624a18bec2b3e (patch) | |
| tree | 293ed031bf8f31484ff94394ed5a5938079be21a | |
| parent | dca6ff48c1a26f8eab911f4ad246f56be5005fd7 (diff) | |
| download | mariadb-git-5b83aee35dffff0de4758a2a595624a18bec2b3e.tar.gz | |
bug #857050 ST_WITHIN returns wrong result with MULTIPOINT and POLYGON
actually only testcase added as the bug was fixed already.
modified:
mysql-test/r/gis-precise.result
bug #857050 ST_WITHIN returns wrong result with MULTIPOINT and POLYGON
test result updated.
mysql-test/t/gis-precise.test
bug #857050 ST_WITHIN returns wrong result with MULTIPOINT and POLYGON
test case added.
sql/gcalc_tools.cc
superfluous variable removed.
| -rw-r--r-- | mysql-test/r/gis-precise.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/gis-precise.test | 3 | ||||
| -rw-r--r-- | sql/gcalc_tools.cc | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/gis-precise.result b/mysql-test/r/gis-precise.result index 209004b565f..1bfd805d141 100644 --- a/mysql-test/r/gis-precise.result +++ b/mysql-test/r/gis-precise.result @@ -428,3 +428,6 @@ ST_EQUALS( MULTIPOINTFROMTEXT(' MULTIPOINT( 5 1 , 6 9 , 1 4 , 4 0 ) ') , MULTIPO SELECT ST_EQUALS( MULTIPOINTFROMTEXT(' MULTIPOINT( 5 1 , 6 9 , 1 4 , 4 0 ) ') , MULTIPOINTFROMTEXT('MULTIPOINT( 4 0 , 6 9 , 5 1, 1 4 )') ); ST_EQUALS( MULTIPOINTFROMTEXT(' MULTIPOINT( 5 1 , 6 9 , 1 4 , 4 0 ) ') , MULTIPOINTFROMTEXT('MULTIPOINT( 4 0 , 6 9 , 5 1, 1 4 )') ) 1 +SELECT ST_WITHIN( MULTIPOINTFROMTEXT(' MULTIPOINT( 2 9 , 2 9 , 4 9 , 9 1 ) ') , POLYGONFROMTEXT(' POLYGON( ( 2 2 , 2 8 , 8 8 , 8 2 , 2 2 ) , ( 4 4 , 4 6 , 6 6 , 6 4 , 4 4 ) ) ')); +ST_WITHIN( MULTIPOINTFROMTEXT(' MULTIPOINT( 2 9 , 2 9 , 4 9 , 9 1 ) ') , POLYGONFROMTEXT(' POLYGON( ( 2 2 , 2 8 , 8 8 , 8 2 , 2 2 ) , ( 4 4 , 4 6 , 6 6 , 6 4 , 4 4 ) ) ')) +0 diff --git a/mysql-test/t/gis-precise.test b/mysql-test/t/gis-precise.test index 78b2c0287f6..36218c56f17 100644 --- a/mysql-test/t/gis-precise.test +++ b/mysql-test/t/gis-precise.test @@ -303,3 +303,6 @@ SELECT ST_TOUCHES( GEOMETRYFROMTEXT(' LINESTRING( 1 1 , 1 4 , 5 0 , 8 3 ) ') , P SELECT ST_EQUALS( MULTIPOINTFROMTEXT(' MULTIPOINT( 5 1 , 6 9 , 1 4 , 4 0 ) ') , MULTIPOINTFROMTEXT(' MULTIPOINT( 5 8 , 5 2 , 1 8 , 3 0 , 3 0 , 7 8 ) ') ); SELECT ST_EQUALS( MULTIPOINTFROMTEXT(' MULTIPOINT( 5 1 , 6 9 , 1 4 , 4 0 ) ') , MULTIPOINTFROMTEXT('MULTIPOINT( 4 0 , 6 9 , 5 1, 1 4 )') ); +#bug 857050 ST_WITHIN returns wrong result with MULTIPOINT and POLYGON +SELECT ST_WITHIN( MULTIPOINTFROMTEXT(' MULTIPOINT( 2 9 , 2 9 , 4 9 , 9 1 ) ') , POLYGONFROMTEXT(' POLYGON( ( 2 2 , 2 8 , 8 8 , 8 2 , 2 2 ) , ( 4 4 , 4 6 , 6 6 , 6 4 , 4 4 ) ) ')); + diff --git a/sql/gcalc_tools.cc b/sql/gcalc_tools.cc index 4c56e5c58bd..69071c16ee8 100644 --- a/sql/gcalc_tools.cc +++ b/sql/gcalc_tools.cc @@ -766,7 +766,9 @@ int ca_counter= 0; int Gcalc_operation_reducer::count_slice(Gcalc_scan_iterator *si) { Gcalc_point_iterator pi(si); +#ifdef TMP_BLOCK const Gcalc_heap::Info *event_point= NULL; +#endif /*TMP_BLOCK*/ int prev_state= 0; int sav_prev_state; active_thread *prev_range= NULL; @@ -858,8 +860,10 @@ int Gcalc_operation_reducer::count_slice(Gcalc_scan_iterator *si) { active_thread *cur_t= *cur_t_hook; +#ifdef TMP_BLOCK if (!event_point && events->event != scev_intersection) event_point= events->pi; +#endif /*TMP_BLOCK*/ if (events->event == scev_single_point) continue; |