diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-08-25 10:25:48 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-25 10:25:48 +0200 |
| commit | 27412877dbcf601676f4515a99b2abee1f19623b (patch) | |
| tree | 2cb1a2e1a58ba10f2a96fcdec43f5ed77c326fd0 /storage/myisammrg | |
| parent | f2033df6ac0f64664d9aad2d56fdd74f4bf9d666 (diff) | |
| parent | a544225d0a772bd4b67c96f5861ecc0ef7e69bba (diff) | |
| download | mariadb-git-27412877dbcf601676f4515a99b2abee1f19623b.tar.gz | |
Merge branch '10.2' into bb-10.2-ext
Diffstat (limited to 'storage/myisammrg')
| -rw-r--r-- | storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff | 4 | ||||
| -rw-r--r-- | storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff | 8 |
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 024c1646892..6f337ffb638 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 1caa6c3d5a8..04c56979244 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) |