diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2015-06-25 13:16:27 +0500 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2015-06-25 13:16:27 +0500 |
| commit | 9111ab7127f4e87220ca46a5f845b566c3633d69 (patch) | |
| tree | 2a879f8d174d6afb7b53e9b09faa9de8a6800eaf /mysql-test/suite/archive | |
| parent | 42bc08b347d2e4341952f4c7bcded7a15e1b4566 (diff) | |
| download | mariadb-git-9111ab7127f4e87220ca46a5f845b566c3633d69.tar.gz | |
GIS-related tests started to fail as some related functions
don't return NULL-s anymore, and actually they're not BOOLEAN.
Fixed.
Diffstat (limited to 'mysql-test/suite/archive')
| -rw-r--r-- | mysql-test/suite/archive/archive_gis.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/archive/archive_gis.result b/mysql-test/suite/archive/archive_gis.result index 9f3c5b062a3..6ee50fd3b85 100644 --- a/mysql-test/suite/archive/archive_gis.result +++ b/mysql-test/suite/archive/archive_gis.result @@ -395,7 +395,7 @@ first second w c o e d t i r 120 120 1 1 0 1 0 0 1 0 120 121 0 0 1 0 0 0 1 0 121 120 0 0 1 0 0 0 1 0 -121 121 1 1 0 1 0 1 1 0 +121 121 1 1 0 1 0 0 1 0 explain extended SELECT g1.fid as first, g2.fid as second, Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o, Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t, @@ -494,7 +494,7 @@ mbroverlaps down,left,right,up SELECT GROUP_CONCAT(a2.name ORDER BY a2.name) AS mbrtouches FROM t1 a1 JOIN t1 a2 ON MBRTouches( a1.square, a2.square) WHERE a1.name = "center" GROUP BY a1.name; mbrtouches -big,center,down,down2,left,left2,right,right2,small,up,up2 +down2,left2,right2,up2 SELECT GROUP_CONCAT(a2.name ORDER BY a2.name) AS mbrwithin FROM t1 a1 JOIN t1 a2 ON MBRWithin( a1.square, a2.square) WHERE a1.name = "center" GROUP BY a1.name; mbrwithin big,center @@ -515,7 +515,7 @@ overlaps down,left,right,up SELECT GROUP_CONCAT(a2.name ORDER BY a2.name) AS touches FROM t1 a1 JOIN t1 a2 ON Touches( a1.square, a2.square) WHERE a1.name = "center" GROUP BY a1.name; touches -big,center,down,down2,left,left2,right,right2,small,up,up2 +down2,left2,right2,up2 SELECT GROUP_CONCAT(a2.name ORDER BY a2.name) AS within FROM t1 a1 JOIN t1 a2 ON Within( a1.square, a2.square) WHERE a1.name = "center" GROUP BY a1.name; within big,center |