Skip to content

M
MariaDB
Commit 31f4df45 authored by Elena Stepanova's avatar Elena Stepanova Committed by Sergei Golubchik
Browse files
Options

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

Fix storage_engine test results
parent e075c5b4
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
mysql-test/suite/storage_engine/type_spatial.result
View file @ 31f4df45
...@@ -350,8 +350,8 @@ fid IsClosed(g) ...@@ -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)
......
mysql-test/suite/storage_engine/type_spatial_indexes.result
View file @ 31f4df45
...@@ -350,8 +350,8 @@ fid IsClosed(g) ...@@ -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) ...@@ -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)
......
storage/innobase/mysql-test/storage_engine/type_spatial_indexes.rdiff
View file @ 31f4df45
...@@ -352,8 +352,8 @@ ...@@ -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)
......
storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff
View file @ 31f4df45
...@@ -352,8 +352,8 @@ ...@@ -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)
......
storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff
View file @ 31f4df45
...@@ -352,8 +352,8 @@ ...@@ -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 @@ ...@@ -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)
......
storage/xtradb/mysql-test/storage_engine/type_spatial_indexes.rdiff
View file @ 31f4df45
...@@ -352,8 +352,8 @@ ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7