1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

main.gis test fixed.

Browse Source
This commit is contained in:
Alexey Botchkov 2013-07-26 16:03:56 +05:00
parent b385fdc6cc
commit 62feb0c5ae
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/r/gis.result
View File

@ -918,25 +918,25 @@ SELECT Overlaps(@horiz1, @point2) FROM DUAL;
Overlaps(@horiz1, @point2) Overlaps(@horiz1, @point2)
0 0
DROP TABLE t1; 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; select f1 from t1 union select f1 from t1;
f1 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)')); GeomFromText('LINESTRING(0 0,1 1,2 2)'));
select AsText(f2),AsText(f3) from t1; select AsText(f2),AsText(f3) from t1;
AsText(f2) AsText(f3) 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; select AsText(a) from (select f2 as a from t1 union select f3 from t1) t;
AsText(a) AsText(a)
POINT(1 1) LINESTRING(1 1,2 2)
LINESTRING(0 0,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; create table t2 as select f2 as a from t1 union select f3 from t1;
desc t2; desc t2;
Field Type Null Key Default Extra Field Type Null Key Default Extra
a point YES NULL a linestring YES NULL
select AsText(a) from t2; select AsText(a) from t2;
AsText(a) AsText(a)
POINT(1 1) LINESTRING(1 1,2 2)
LINESTRING(0 0,1 1,2 2) LINESTRING(0 0,1 1,2 2)
drop table t1, t2; drop table t1, t2;
SELECT 1; SELECT 1;

4
mysql-test/t/gis.test
View File

@ -609,9 +609,9 @@ DROP TABLE t1;
# #
# Bug#28763: Selecting geometry fields in UNION caused server crash. # Bug#28763: Selecting geometry fields in UNION caused server crash.
# #
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; select f1 from t1 union select f1 from t1;
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)')); GeomFromText('LINESTRING(0 0,1 1,2 2)'));
select AsText(f2),AsText(f3) from t1; select AsText(f2),AsText(f3) from t1;
select AsText(a) from (select f2 as a from t1 union select f3 from t1) t; select AsText(a) from (select f2 as a from t1 union select f3 from t1) t;