1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-12915 ST_Centroid does not return the same result than MySQL

Browse Source 
Fix storage_engine test results
This commit is contained in:
Elena Stepanova 2017-07-31 20:34:22 +03:00 committed by Sergei Golubchik
parent e075c5b491
commit 31f4df4505
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/storage_engine/type_spatial.result
View File

@ -350,8 +350,8 @@ fid IsClosed(g)
116 0 116 0
SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon; SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon;
fid AsText(Centroid(g)) fid AsText(Centroid(g))
117 POINT(55.58852775304245 17.426536064113982) 117 POINT(57.98031067576927 17.854754130800433)
118 POINT(55.58852775304245 17.426536064113982) 118 POINT(57.98031067576927 17.854754130800433)
119 POINT(2 2) 119 POINT(2 2)
SELECT fid, Area(g) FROM gis_multi_polygon; SELECT fid, Area(g) FROM gis_multi_polygon;
fid Area(g) fid Area(g)

8
mysql-test/suite/storage_engine/type_spatial_indexes.result
View File

@ -350,8 +350,8 @@ fid IsClosed(g)
116 0 116 0
SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon; SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon;
fid AsText(Centroid(g)) fid AsText(Centroid(g))
117 POINT(55.58852775304245 17.426536064113982) 117 POINT(57.98031067576927 17.854754130800433)
118 POINT(55.58852775304245 17.426536064113982) 118 POINT(57.98031067576927 17.854754130800433)
119 POINT(2 2) 119 POINT(2 2)
SELECT fid, Area(g) FROM gis_multi_polygon; SELECT fid, Area(g) FROM gis_multi_polygon;
fid Area(g) fid Area(g)
@ -1050,8 +1050,8 @@ fid IsClosed(g)
116 0 116 0
SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon; SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon;
fid AsText(Centroid(g)) fid AsText(Centroid(g))
117 POINT(55.58852775304245 17.426536064113982) 117 POINT(57.98031067576927 17.854754130800433)
118 POINT(55.58852775304245 17.426536064113982) 118 POINT(57.98031067576927 17.854754130800433)
119 POINT(2 2) 119 POINT(2 2)
SELECT fid, Area(g) FROM gis_multi_polygon; SELECT fid, Area(g) FROM gis_multi_polygon;
fid Area(g) fid Area(g)

4
storage/innobase/mysql-test/storage_engine/type_spatial_indexes.rdiff
View File

@ -352,8 +352,8 @@
-116 0 -116 0
-SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon; -SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon;
-fid AsText(Centroid(g)) -fid AsText(Centroid(g))
-117 POINT(55.58852775304245 17.426536064113982) -117 POINT(57.98031067576927 17.854754130800433)
-118 POINT(55.58852775304245 17.426536064113982) -118 POINT(57.98031067576927 17.854754130800433)
-119 POINT(2 2) -119 POINT(2 2)
-SELECT fid, Area(g) FROM gis_multi_polygon; -SELECT fid, Area(g) FROM gis_multi_polygon;
-fid Area(g) -fid Area(g)

4
storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff
View File

@ -352,8 +352,8 @@
-116 0 -116 0
-SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon; -SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon;
-fid AsText(Centroid(g)) -fid AsText(Centroid(g))
-117 POINT(55.58852775304245 17.426536064113982) -117 POINT(57.98031067576927 17.854754130800433)
-118 POINT(55.58852775304245 17.426536064113982) -118 POINT(57.98031067576927 17.854754130800433)
-119 POINT(2 2) -119 POINT(2 2)
-SELECT fid, Area(g) FROM gis_multi_polygon; -SELECT fid, Area(g) FROM gis_multi_polygon;
-fid Area(g) -fid Area(g)

8
storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff
View File

@ -352,8 +352,8 @@
-116 0 -116 0
-SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon; -SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon;
-fid AsText(Centroid(g)) -fid AsText(Centroid(g))
-117 POINT(55.58852775304245 17.426536064113982) -117 POINT(57.98031067576927 17.854754130800433)
-118 POINT(55.58852775304245 17.426536064113982) -118 POINT(57.98031067576927 17.854754130800433)
-119 POINT(2 2) -119 POINT(2 2)
-SELECT fid, Area(g) FROM gis_multi_polygon; -SELECT fid, Area(g) FROM gis_multi_polygon;
-fid Area(g) -fid Area(g)
@ -1062,8 +1062,8 @@
-116 0 -116 0
-SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon; -SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon;
-fid AsText(Centroid(g)) -fid AsText(Centroid(g))
-117 POINT(55.58852775304245 17.426536064113982) -117 POINT(57.98031067576927 17.854754130800433)
-118 POINT(55.58852775304245 17.426536064113982) -118 POINT(57.98031067576927 17.854754130800433)
-119 POINT(2 2) -119 POINT(2 2)
-SELECT fid, Area(g) FROM gis_multi_polygon; -SELECT fid, Area(g) FROM gis_multi_polygon;
-fid Area(g) -fid Area(g)

4
storage/xtradb/mysql-test/storage_engine/type_spatial_indexes.rdiff
View File

@ -352,8 +352,8 @@
-116 0 -116 0
-SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon; -SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon;
-fid AsText(Centroid(g)) -fid AsText(Centroid(g))
-117 POINT(55.58852775304245 17.426536064113982) -117 POINT(57.98031067576927 17.854754130800433)
-118 POINT(55.58852775304245 17.426536064113982) -118 POINT(57.98031067576927 17.854754130800433)
-119 POINT(2 2) -119 POINT(2 2)
-SELECT fid, Area(g) FROM gis_multi_polygon; -SELECT fid, Area(g) FROM gis_multi_polygon;
-fid Area(g) -fid Area(g)