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

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

Browse Source
This commit is contained in:
unknown 2004-08-24 10:15:39 +03:00
parent b2b215d9ce
commit 8d9dca16e2
4 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/r/subselect.result
View File

@ -1251,11 +1251,6 @@ a b
2 NULL 2 NULL
3 1 3 1
drop table t1, t2; 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` ( CREATE TABLE `t1` (
`id` mediumint(8) unsigned NOT NULL auto_increment, `id` mediumint(8) unsigned NOT NULL auto_increment,
`pseudo` varchar(35) NOT NULL default '', `pseudo` varchar(35) NOT NULL default '',

8
mysql-test/r/subselect_gis.result Normal file
View File

@ -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;

8
mysql-test/t/subselect.test
View File

@ -758,14 +758,6 @@ select * from t1;
drop table t1, t2; 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 # reduced subselect in ORDER BY & GROUP BY clauses
# #

15
mysql-test/t/subselect_gis.test Normal file
View File

@ -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;