Commit 8d9dca16 authored by unknown's avatar unknown
Browse files

subselect test split on two tests because gis extention can be absent

parent b2b215d9

mysql-test/r/subselect.result

+0 −5
Original line number Diff line number Diff line
@@ -1251,11 +1251,6 @@ a b 
2	NULL

3	1

drop table t1, t2;

create table t1(City VARCHAR(30),Location geometry);

insert into t1 values("Paris",GeomFromText('POINT(2.33 48.87)'));

select City from t1 where (select intersects(GeomFromText(AsText(Location)),GeomFromText('Polygon((2 50, 2.5 50, 2.5 47, 2 47, 2 50))'))=0);

City

drop table t1;

CREATE TABLE `t1` (

`id` mediumint(8) unsigned NOT NULL auto_increment,

`pseudo` varchar(35) NOT NULL default '',

mysql-test/r/subselect_gis.result

0 → 100644
+8 −0
Original line number Diff line number Diff line 
drop table if exists t1;

create table t1(City VARCHAR(30),Location geometry);

insert into t1 values("Paris",GeomFromText('POINT(2.33 48.87)'));

select City from t1 where (select

intersects(GeomFromText(AsText(Location)),GeomFromText('Polygon((2 50, 2.5

50, 2.5 47, 2 47, 2 50))'))=0);

City

drop table t1;

mysql-test/t/subselect.test

+0 −8
Original line number Diff line number Diff line
@@ -758,14 +758,6 @@ select * from t1; 


drop table t1, t2;



#

# correct behavoiur for function from reduced subselect

#

create table t1(City VARCHAR(30),Location geometry);

insert into t1 values("Paris",GeomFromText('POINT(2.33 48.87)'));

select City from t1 where (select intersects(GeomFromText(AsText(Location)),GeomFromText('Polygon((2 50, 2.5 50, 2.5 47, 2 47, 2 50))'))=0);

drop table t1;



#

# reduced subselect in ORDER BY & GROUP BY clauses

#

mysql-test/t/subselect_gis.test

0 → 100644
+15 −0
Original line number Diff line number Diff line 
-- source include/have_geometry.inc



--disable_warnings

drop table if exists t1;

--enable_warnings



#

# correct behavoiur for function from reduced subselect

#

create table t1(City VARCHAR(30),Location geometry);

insert into t1 values("Paris",GeomFromText('POINT(2.33 48.87)'));

select City from t1 where (select

intersects(GeomFromText(AsText(Location)),GeomFromText('Polygon((2 50, 2.5

50, 2.5 47, 2 47, 2 50))'))=0);

drop table t1;