summaryrefslogtreecommitdiff
path: root/storage/myisammrg
diff options
context:
space:
mode:
authorElena Stepanova <elenst@montyprogram.com>2017-07-31 20:34:22 +0300
committerSergei Golubchik <serg@mariadb.org>2017-08-01 09:52:59 +0200
commit31f4df450502d96854c052ce3cd2858ce9dbf900 (patch)
treed3b4c1745a786fbfc2093d358ee9e0a46f87daf3 /storage/myisammrg
parente075c5b491b8e9030589cdf5d9aa5222e9cd1bc1 (diff)
downloadmariadb-git-31f4df450502d96854c052ce3cd2858ce9dbf900.tar.gz
MDEV-12915 ST_Centroid does not return the same result than MySQL
Fix storage_engine test results
Diffstat (limited to 'storage/myisammrg')
-rw-r--r--storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff4
-rw-r--r--storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff8
2 files changed, 6 insertions, 6 deletions
diff --git a/storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff b/storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff
index 52e9d9fdbe4..70675d241b9 100644
--- a/storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff
+++ b/storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff
@@ -352,8 +352,8 @@
-116 0
-SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon;
-fid AsText(Centroid(g))
--117 POINT(55.58852775304245 17.426536064113982)
--118 POINT(55.58852775304245 17.426536064113982)
+-117 POINT(57.98031067576927 17.854754130800433)
+-118 POINT(57.98031067576927 17.854754130800433)
-119 POINT(2 2)
-SELECT fid, Area(g) FROM gis_multi_polygon;
-fid Area(g)
diff --git a/storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff b/storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff
index ecd0025c9d9..b14bd251f58 100644
--- a/storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff
+++ b/storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff
@@ -352,8 +352,8 @@
-116 0
-SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon;
-fid AsText(Centroid(g))
--117 POINT(55.58852775304245 17.426536064113982)
--118 POINT(55.58852775304245 17.426536064113982)
+-117 POINT(57.98031067576927 17.854754130800433)
+-118 POINT(57.98031067576927 17.854754130800433)
-119 POINT(2 2)
-SELECT fid, Area(g) FROM gis_multi_polygon;
-fid Area(g)
@@ -1062,8 +1062,8 @@
-116 0
-SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon;
-fid AsText(Centroid(g))
--117 POINT(55.58852775304245 17.426536064113982)
--118 POINT(55.58852775304245 17.426536064113982)
+-117 POINT(57.98031067576927 17.854754130800433)
+-118 POINT(57.98031067576927 17.854754130800433)
-119 POINT(2 2)
-SELECT fid, Area(g) FROM gis_multi_polygon;
-fid Area(g)