summaryrefslogtreecommitdiff
path: root/mysql-test/r/gis.result
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2013-07-26 16:03:56 +0500
committerAlexey Botchkov <holyfoot@askmonty.org>2013-07-26 16:03:56 +0500
commit62feb0c5aea9deed8da70774e0674fb459a84e34 (patch)
tree44e39d464e52f57d0c73abff49a77d5df21bffda /mysql-test/r/gis.result
parentb385fdc6cca542c5b5a0671bc141a8b9b29e72a4 (diff)
downloadmariadb-git-62feb0c5aea9deed8da70774e0674fb459a84e34.tar.gz
main.gis test fixed.
Diffstat (limited to 'mysql-test/r/gis.result')
-rw-r--r--mysql-test/r/gis.result12
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
index eb9f1a57c32..fa7b93092d9 100644
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@@ -918,25 +918,25 @@ SELECT Overlaps(@horiz1, @point2) FROM DUAL;
Overlaps(@horiz1, @point2)
0
DROP TABLE t1;
-create table t1(f1 geometry, f2 point, f3 linestring);
+create table t1(f1 geometry, f2 linestring, f3 linestring);
select f1 from t1 union select f1 from t1;
f1
-insert into t1 (f2,f3) values (GeomFromText('POINT(1 1)'),
+insert into t1 (f2,f3) values (GeomFromText('LINESTRING(1 1, 2 2)'),
GeomFromText('LINESTRING(0 0,1 1,2 2)'));
select AsText(f2),AsText(f3) from t1;
AsText(f2) AsText(f3)
-POINT(1 1) LINESTRING(0 0,1 1,2 2)
+LINESTRING(1 1,2 2) LINESTRING(0 0,1 1,2 2)
select AsText(a) from (select f2 as a from t1 union select f3 from t1) t;
AsText(a)
-POINT(1 1)
+LINESTRING(1 1,2 2)
LINESTRING(0 0,1 1,2 2)
create table t2 as select f2 as a from t1 union select f3 from t1;
desc t2;
Field Type Null Key Default Extra
-a point YES NULL
+a linestring YES NULL
select AsText(a) from t2;
AsText(a)
-POINT(1 1)
+LINESTRING(1 1,2 2)
LINESTRING(0 0,1 1,2 2)
drop table t1, t2;
SELECT 1;