diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result index bc91eabf2bf..97e947e4ba5 100644 --- a/mysql-test/r/subselect.result +++ b/mysql-test/r/subselect.result @@ -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 '', diff --git a/mysql-test/r/subselect_gis.result b/mysql-test/r/subselect_gis.result new file mode 100644 index 00000000000..34ab7748656 --- /dev/null +++ b/mysql-test/r/subselect_gis.result @@ -0,0 +1,8 @@ +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; diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test index d7a13167978..3f6cf2a9830 100644 --- a/mysql-test/t/subselect.test +++ b/mysql-test/t/subselect.test @@ -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 # diff --git a/mysql-test/t/subselect_gis.test b/mysql-test/t/subselect_gis.test new file mode 100644 index 00000000000..338051029c4 --- /dev/null +++ b/mysql-test/t/subselect_gis.test @@ -0,0 +1,15 @@ +-- 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;