Commit fa1775b6 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
parents 6ef92d62 fc94e580

mysql-test/include/gis_generic.inc

+18 −17
Original line number Diff line number Diff line
@@ -8,14 +8,14 @@ 
DROP TABLE IF EXISTS t1, gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;

--enable_warnings



CREATE TABLE gis_point  (fid INTEGER, g POINT);

CREATE TABLE gis_line  (fid INTEGER, g LINESTRING);

CREATE TABLE gis_polygon   (fid INTEGER, g POLYGON);

CREATE TABLE gis_multi_point (fid INTEGER, g MULTIPOINT);

CREATE TABLE gis_multi_line (fid INTEGER, g MULTILINESTRING);

CREATE TABLE gis_multi_polygon  (fid INTEGER, g MULTIPOLYGON);

CREATE TABLE gis_geometrycollection  (fid INTEGER, g GEOMETRYCOLLECTION);

CREATE TABLE gis_geometry (fid INTEGER, g GEOMETRY);

CREATE TABLE gis_point  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g POINT);

CREATE TABLE gis_line  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g LINESTRING);

CREATE TABLE gis_polygon   (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g POLYGON);

CREATE TABLE gis_multi_point (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTIPOINT);

CREATE TABLE gis_multi_line (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTILINESTRING);

CREATE TABLE gis_multi_polygon  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTIPOLYGON);

CREATE TABLE gis_geometrycollection  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g GEOMETRYCOLLECTION);

CREATE TABLE gis_geometry (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g GEOMETRY);



SHOW CREATE TABLE gis_point;

SHOW FIELDS FROM gis_point;
@@ -141,6 +141,7 @@ DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gi 
# Check that ALTER TABLE doesn't loose geometry type

#

CREATE TABLE t1 (

  a INTEGER PRIMARY KEY AUTO_INCREMENT,

  gp  point,

  ln  linestring,

  pg  polygon,
@@ -156,24 +157,24 @@ ALTER TABLE t1 ADD fid INT; 
SHOW FIELDS FROM t1;

DROP TABLE t1;



create table t1 (a geometry not null);

insert into t1 values (GeomFromText('Point(1 2)'));

create table t1 (pk integer primary key auto_increment, a geometry not null);

insert into t1 (a) values (GeomFromText('Point(1 2)'));

-- error 1416

insert into t1 values ('Garbage');

insert into t1 (a) values ('Garbage');

-- error 1416

insert IGNORE into t1 values ('Garbage');

insert IGNORE into t1 (a) values ('Garbage');



drop table t1;



create table t1 (fl geometry);

create table t1 (pk integer primary key auto_increment, fl geometry);

--error 1416

insert into t1 values (1);

insert into t1 (fl) values (1);

--error 1416

insert into t1 values (1.11);

insert into t1 (fl) values (1.11);

--error 1416

insert into t1 values ("qwerty");

insert into t1 (fl) values ("qwerty");

--error 1416

insert into t1 values (pointfromtext('point(1,1)'));

insert into t1 (fl) values (pointfromtext('point(1,1)'));



drop table t1;

mysql-test/r/archive_gis.result

+31 −27
Original line number Diff line number Diff line 
SET storage_engine=archive;

DROP TABLE IF EXISTS t1, gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;

CREATE TABLE gis_point  (fid INTEGER, g POINT);

CREATE TABLE gis_line  (fid INTEGER, g LINESTRING);

CREATE TABLE gis_polygon   (fid INTEGER, g POLYGON);

CREATE TABLE gis_multi_point (fid INTEGER, g MULTIPOINT);

CREATE TABLE gis_multi_line (fid INTEGER, g MULTILINESTRING);

CREATE TABLE gis_multi_polygon  (fid INTEGER, g MULTIPOLYGON);

CREATE TABLE gis_geometrycollection  (fid INTEGER, g GEOMETRYCOLLECTION);

CREATE TABLE gis_geometry (fid INTEGER, g GEOMETRY);

CREATE TABLE gis_point  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g POINT);

CREATE TABLE gis_line  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g LINESTRING);

CREATE TABLE gis_polygon   (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g POLYGON);

CREATE TABLE gis_multi_point (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTIPOINT);

CREATE TABLE gis_multi_line (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTILINESTRING);

CREATE TABLE gis_multi_polygon  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTIPOLYGON);

CREATE TABLE gis_geometrycollection  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g GEOMETRYCOLLECTION);

CREATE TABLE gis_geometry (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g GEOMETRY);

SHOW CREATE TABLE gis_point;

Table	Create Table

gis_point	CREATE TABLE `gis_point` (

  `fid` int(11) default NULL,

  `g` point default NULL

  `fid` int(11) NOT NULL auto_increment,

  `g` point default NULL,

  PRIMARY KEY (`fid`)

) ENGINE=ARCHIVE DEFAULT CHARSET=latin1

SHOW FIELDS FROM gis_point;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	point	YES		NULL	

SHOW FIELDS FROM gis_line;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	linestring	YES		NULL	

SHOW FIELDS FROM gis_polygon;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	polygon	YES		NULL	

SHOW FIELDS FROM gis_multi_point;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	multipoint	YES		NULL	

SHOW FIELDS FROM gis_multi_line;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	multilinestring	YES		NULL	

SHOW FIELDS FROM gis_multi_polygon;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	multipolygon	YES		NULL	

SHOW FIELDS FROM gis_geometrycollection;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	geometrycollection	YES		NULL	

SHOW FIELDS FROM gis_geometry;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	geometry	YES		NULL	

INSERT INTO gis_point VALUES 

(101, PointFromText('POINT(10 10)')),
@@ -407,6 +408,7 @@ Warnings: 
Note	1003	select `test`.`g1`.`fid` AS `first`,`test`.`g2`.`fid` AS `second`,within(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `w`,contains(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `c`,overlaps(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `o`,equals(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `e`,disjoint(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `d`,touches(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `t`,intersects(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `i`,crosses(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `r` from `test`.`gis_geometrycollection` `g1` join `test`.`gis_geometrycollection` `g2` order by `test`.`g1`.`fid`,`test`.`g2`.`fid`

DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;

CREATE TABLE t1 (

a INTEGER PRIMARY KEY AUTO_INCREMENT,

gp  point,

ln  linestring,

pg  polygon,
@@ -418,6 +420,7 @@ gm geometry 
);

SHOW FIELDS FROM t1;

Field	Type	Null	Key	Default	Extra

a	int(11)	NO	PRI	NULL	auto_increment

gp	point	YES		NULL	

ln	linestring	YES		NULL	

pg	polygon	YES		NULL
@@ -429,6 +432,7 @@ gm geometry YES NULL 
ALTER TABLE t1 ADD fid INT;

SHOW FIELDS FROM t1;

Field	Type	Null	Key	Default	Extra

a	int(11)	NO	PRI	NULL	auto_increment

gp	point	YES		NULL	

ln	linestring	YES		NULL	

pg	polygon	YES		NULL
@@ -439,20 +443,20 @@ gc geometrycollection YES NULL 
gm	geometry	YES		NULL	

fid	int(11)	YES		NULL	

DROP TABLE t1;

create table t1 (a geometry not null);

insert into t1 values (GeomFromText('Point(1 2)'));

insert into t1 values ('Garbage');

create table t1 (pk integer primary key auto_increment, a geometry not null);

insert into t1 (a) values (GeomFromText('Point(1 2)'));

insert into t1 (a) values ('Garbage');

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

insert IGNORE into t1 values ('Garbage');

insert IGNORE into t1 (a) values ('Garbage');

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

drop table t1;

create table t1 (fl geometry);

insert into t1 values (1);

create table t1 (pk integer primary key auto_increment, fl geometry);

insert into t1 (fl) values (1);

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

insert into t1 values (1.11);

insert into t1 (fl) values (1.11);

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

insert into t1 values ("qwerty");

insert into t1 (fl) values ("qwerty");

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

insert into t1 values (pointfromtext('point(1,1)'));

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;

mysql-test/r/bdb_gis.result

+31 −27
Original line number Diff line number Diff line 
SET storage_engine=bdb;

DROP TABLE IF EXISTS t1, gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;

CREATE TABLE gis_point  (fid INTEGER, g POINT);

CREATE TABLE gis_line  (fid INTEGER, g LINESTRING);

CREATE TABLE gis_polygon   (fid INTEGER, g POLYGON);

CREATE TABLE gis_multi_point (fid INTEGER, g MULTIPOINT);

CREATE TABLE gis_multi_line (fid INTEGER, g MULTILINESTRING);

CREATE TABLE gis_multi_polygon  (fid INTEGER, g MULTIPOLYGON);

CREATE TABLE gis_geometrycollection  (fid INTEGER, g GEOMETRYCOLLECTION);

CREATE TABLE gis_geometry (fid INTEGER, g GEOMETRY);

CREATE TABLE gis_point  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g POINT);

CREATE TABLE gis_line  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g LINESTRING);

CREATE TABLE gis_polygon   (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g POLYGON);

CREATE TABLE gis_multi_point (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTIPOINT);

CREATE TABLE gis_multi_line (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTILINESTRING);

CREATE TABLE gis_multi_polygon  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTIPOLYGON);

CREATE TABLE gis_geometrycollection  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g GEOMETRYCOLLECTION);

CREATE TABLE gis_geometry (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g GEOMETRY);

SHOW CREATE TABLE gis_point;

Table	Create Table

gis_point	CREATE TABLE `gis_point` (

  `fid` int(11) default NULL,

  `g` point default NULL

  `fid` int(11) NOT NULL auto_increment,

  `g` point default NULL,

  PRIMARY KEY (`fid`)

) ENGINE=BerkeleyDB DEFAULT CHARSET=latin1

SHOW FIELDS FROM gis_point;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	point	YES		NULL	

SHOW FIELDS FROM gis_line;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	linestring	YES		NULL	

SHOW FIELDS FROM gis_polygon;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	polygon	YES		NULL	

SHOW FIELDS FROM gis_multi_point;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	multipoint	YES		NULL	

SHOW FIELDS FROM gis_multi_line;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	multilinestring	YES		NULL	

SHOW FIELDS FROM gis_multi_polygon;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	multipolygon	YES		NULL	

SHOW FIELDS FROM gis_geometrycollection;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	geometrycollection	YES		NULL	

SHOW FIELDS FROM gis_geometry;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	geometry	YES		NULL	

INSERT INTO gis_point VALUES 

(101, PointFromText('POINT(10 10)')),
@@ -407,6 +408,7 @@ Warnings: 
Note	1003	select `test`.`g1`.`fid` AS `first`,`test`.`g2`.`fid` AS `second`,within(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `w`,contains(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `c`,overlaps(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `o`,equals(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `e`,disjoint(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `d`,touches(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `t`,intersects(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `i`,crosses(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `r` from `test`.`gis_geometrycollection` `g1` join `test`.`gis_geometrycollection` `g2` order by `test`.`g1`.`fid`,`test`.`g2`.`fid`

DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;

CREATE TABLE t1 (

a INTEGER PRIMARY KEY AUTO_INCREMENT,

gp  point,

ln  linestring,

pg  polygon,
@@ -418,6 +420,7 @@ gm geometry 
);

SHOW FIELDS FROM t1;

Field	Type	Null	Key	Default	Extra

a	int(11)	NO	PRI	NULL	auto_increment

gp	point	YES		NULL	

ln	linestring	YES		NULL	

pg	polygon	YES		NULL
@@ -429,6 +432,7 @@ gm geometry YES NULL 
ALTER TABLE t1 ADD fid INT;

SHOW FIELDS FROM t1;

Field	Type	Null	Key	Default	Extra

a	int(11)	NO	PRI	NULL	auto_increment

gp	point	YES		NULL	

ln	linestring	YES		NULL	

pg	polygon	YES		NULL
@@ -439,20 +443,20 @@ gc geometrycollection YES NULL 
gm	geometry	YES		NULL	

fid	int(11)	YES		NULL	

DROP TABLE t1;

create table t1 (a geometry not null);

insert into t1 values (GeomFromText('Point(1 2)'));

insert into t1 values ('Garbage');

create table t1 (pk integer primary key auto_increment, a geometry not null);

insert into t1 (a) values (GeomFromText('Point(1 2)'));

insert into t1 (a) values ('Garbage');

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

insert IGNORE into t1 values ('Garbage');

insert IGNORE into t1 (a) values ('Garbage');

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

drop table t1;

create table t1 (fl geometry);

insert into t1 values (1);

create table t1 (pk integer primary key auto_increment, fl geometry);

insert into t1 (fl) values (1);

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

insert into t1 values (1.11);

insert into t1 (fl) values (1.11);

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

insert into t1 values ("qwerty");

insert into t1 (fl) values ("qwerty");

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

insert into t1 values (pointfromtext('point(1,1)'));

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;

mysql-test/r/innodb_gis.result

+31 −27
Original line number Diff line number Diff line 
SET storage_engine=innodb;

DROP TABLE IF EXISTS t1, gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;

CREATE TABLE gis_point  (fid INTEGER, g POINT);

CREATE TABLE gis_line  (fid INTEGER, g LINESTRING);

CREATE TABLE gis_polygon   (fid INTEGER, g POLYGON);

CREATE TABLE gis_multi_point (fid INTEGER, g MULTIPOINT);

CREATE TABLE gis_multi_line (fid INTEGER, g MULTILINESTRING);

CREATE TABLE gis_multi_polygon  (fid INTEGER, g MULTIPOLYGON);

CREATE TABLE gis_geometrycollection  (fid INTEGER, g GEOMETRYCOLLECTION);

CREATE TABLE gis_geometry (fid INTEGER, g GEOMETRY);

CREATE TABLE gis_point  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g POINT);

CREATE TABLE gis_line  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g LINESTRING);

CREATE TABLE gis_polygon   (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g POLYGON);

CREATE TABLE gis_multi_point (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTIPOINT);

CREATE TABLE gis_multi_line (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTILINESTRING);

CREATE TABLE gis_multi_polygon  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTIPOLYGON);

CREATE TABLE gis_geometrycollection  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g GEOMETRYCOLLECTION);

CREATE TABLE gis_geometry (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g GEOMETRY);

SHOW CREATE TABLE gis_point;

Table	Create Table

gis_point	CREATE TABLE `gis_point` (

  `fid` int(11) default NULL,

  `g` point default NULL

  `fid` int(11) NOT NULL auto_increment,

  `g` point default NULL,

  PRIMARY KEY (`fid`)

) ENGINE=InnoDB DEFAULT CHARSET=latin1

SHOW FIELDS FROM gis_point;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	point	YES		NULL	

SHOW FIELDS FROM gis_line;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	linestring	YES		NULL	

SHOW FIELDS FROM gis_polygon;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	polygon	YES		NULL	

SHOW FIELDS FROM gis_multi_point;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	multipoint	YES		NULL	

SHOW FIELDS FROM gis_multi_line;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	multilinestring	YES		NULL	

SHOW FIELDS FROM gis_multi_polygon;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	multipolygon	YES		NULL	

SHOW FIELDS FROM gis_geometrycollection;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	geometrycollection	YES		NULL	

SHOW FIELDS FROM gis_geometry;

Field	Type	Null	Key	Default	Extra

fid	int(11)	YES		NULL	

fid	int(11)	NO	PRI	NULL	auto_increment

g	geometry	YES		NULL	

INSERT INTO gis_point VALUES 

(101, PointFromText('POINT(10 10)')),
@@ -407,6 +408,7 @@ Warnings: 
Note	1003	select `test`.`g1`.`fid` AS `first`,`test`.`g2`.`fid` AS `second`,within(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `w`,contains(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `c`,overlaps(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `o`,equals(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `e`,disjoint(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `d`,touches(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `t`,intersects(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `i`,crosses(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `r` from `test`.`gis_geometrycollection` `g1` join `test`.`gis_geometrycollection` `g2` order by `test`.`g1`.`fid`,`test`.`g2`.`fid`

DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;

CREATE TABLE t1 (

a INTEGER PRIMARY KEY AUTO_INCREMENT,

gp  point,

ln  linestring,

pg  polygon,
@@ -418,6 +420,7 @@ gm geometry 
);

SHOW FIELDS FROM t1;

Field	Type	Null	Key	Default	Extra

a	int(11)	NO	PRI	NULL	auto_increment

gp	point	YES		NULL	

ln	linestring	YES		NULL	

pg	polygon	YES		NULL
@@ -429,6 +432,7 @@ gm geometry YES NULL 
ALTER TABLE t1 ADD fid INT;

SHOW FIELDS FROM t1;

Field	Type	Null	Key	Default	Extra

a	int(11)	NO	PRI	NULL	auto_increment

gp	point	YES		NULL	

ln	linestring	YES		NULL	

pg	polygon	YES		NULL
@@ -439,20 +443,20 @@ gc geometrycollection YES NULL 
gm	geometry	YES		NULL	

fid	int(11)	YES		NULL	

DROP TABLE t1;

create table t1 (a geometry not null);

insert into t1 values (GeomFromText('Point(1 2)'));

insert into t1 values ('Garbage');

create table t1 (pk integer primary key auto_increment, a geometry not null);

insert into t1 (a) values (GeomFromText('Point(1 2)'));

insert into t1 (a) values ('Garbage');

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

insert IGNORE into t1 values ('Garbage');

insert IGNORE into t1 (a) values ('Garbage');

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

drop table t1;

create table t1 (fl geometry);

insert into t1 values (1);

create table t1 (pk integer primary key auto_increment, fl geometry);

insert into t1 (fl) values (1);

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

insert into t1 values (1.11);

insert into t1 (fl) values (1.11);

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

insert into t1 values ("qwerty");

insert into t1 (fl) values ("qwerty");

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

insert into t1 values (pointfromtext('point(1,1)'));

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;

mysql-test/r/ndb_gis.result

+62 −102

File changed.

Preview size limit exceeded, changes collapsed.