Commit f469aa00 authored by unknown's avatar unknown
Browse files

bug #22682 Test fails --without-geometry 

geometry dependent parts moved to proper .test files


mysql-test/r/gis.result:
  result fixed
mysql-test/r/innodb.result:
  result fixed
mysql-test/r/innodb_gis.result:
  result fixed
mysql-test/r/view.result:
  result fixed
mysql-test/t/gis.test:
  HAVE_GEOMETRY dependent part moved here from view.test
mysql-test/t/innodb.test:
  HAVE_GEOMETRY dependent part moved to innodb_gis.test
BitKeeper/etc/ignore:
  Added libmysqld/sql_servers.cc to the ignore list
mysql-test/t/innodb_gis.test:
  HAVE_GEOMETRY dependent part moved here from innodb.test
mysql-test/t/view.test:
  HAVE_GEOMETRY dependent part moved to gis.test
parent 72ae6eab

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -2933,3 +2933,4 @@ win/vs71cache.txt 
win/vs8cache.txt

zlib/*.ds?

zlib/*.vcproj

libmysqld/sql_servers.cc

mysql-test/r/gis.result

+11 −0
Original line number Diff line number Diff line
@@ -718,3 +718,14 @@ desc t1; 
Field	Type	Null	Key	Default	Extra

GeomFromText('point(1 1)')	geometry	NO			

drop table t1;

create table t1 (f1 tinyint(1), f2 char(1), f3 varchar(1), f4 geometry, f5 datetime);

create view v1 as select * from t1;

desc v1;

Field	Type	Null	Key	Default	Extra

f1	tinyint(1)	YES		NULL	

f2	char(1)	YES		NULL	

f3	varchar(1)	YES		NULL	

f4	geometry	YES		NULL	

f5	datetime	YES		NULL	

drop view v1;

drop table t1;

mysql-test/r/innodb.result

+0 −2
Original line number Diff line number Diff line
@@ -3447,8 +3447,6 @@ SELECT p0.a FROM t2 p0 WHERE BINARY p0.b = 'customer_over'; 
a

1

drop table t2, t1;

create table t1 (g geometry not null, spatial gk(g)) engine=innodb;

ERROR HY000: The used table type doesn't support SPATIAL indexes

CREATE TABLE t1 ( a int ) ENGINE=innodb;

BEGIN;

INSERT INTO t1 VALUES (1);

mysql-test/r/innodb_gis.result

+2 −0
Original line number Diff line number Diff line
@@ -460,3 +460,5 @@ ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field 
insert into t1 (fl) values (pointfromtext('point(1,1)'));

ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field

drop table t1;

create table t1 (g geometry not null, spatial gk(g)) engine=innodb;

ERROR HY000: The used table type doesn't support SPATIAL indexes

mysql-test/r/view.result

+0 −11
Original line number Diff line number Diff line
@@ -2060,17 +2060,6 @@ CALL p1(); 
DROP PROCEDURE p1;

DROP VIEW v1;

DROP TABLE t1;

create table t1 (f1 tinyint(1), f2 char(1), f3 varchar(1), f4 geometry, f5 datetime);

create view v1 as select * from t1;

desc v1;

Field	Type	Null	Key	Default	Extra

f1	tinyint(1)	YES		NULL	

f2	char(1)	YES		NULL	

f3	varchar(1)	YES		NULL	

f4	geometry	YES		NULL	

f5	datetime	YES		NULL	

drop view v1;

drop table t1;

create table t1(f1 datetime);

insert into t1 values('2005.01.01 12:0:0');

create view v1 as select f1, subtime(f1, '1:1:1') as sb from t1;