summaryrefslogtreecommitdiff
path: root/mysql-test/suite/archive
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-08-17 11:32:16 +0200
committerSergei Golubchik <serg@mariadb.org>2017-08-17 11:38:34 +0200
commitcb1e76e4de120d20064a96be4fcc245c3d22bd78 (patch)
tree29d130592e3dfea50251771979fbaa6923d44ba9 /mysql-test/suite/archive
parenta4885dde4ccec68bbb0268796f62e68e08ba4837 (diff)
parent48fe832650ae2dc0c2eaa957abfa959b0a2670aa (diff)
downloadmariadb-git-cb1e76e4de120d20064a96be4fcc245c3d22bd78.tar.gz
Merge branch '10.1' into 10.2
Diffstat (limited to 'mysql-test/suite/archive')
-rw-r--r--mysql-test/suite/archive/archive_gis.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/archive/archive_gis.result b/mysql-test/suite/archive/archive_gis.result
index 6ee50fd3b85..80c1e347764 100644
--- a/mysql-test/suite/archive/archive_gis.result
+++ b/mysql-test/suite/archive/archive_gis.result
@@ -326,8 +326,8 @@ fid IsClosed(g)
116 0
SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon ORDER by fid;
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 ORDER by fid;
fid Area(g)