merging

1 files changed, 2 insertions, 64 deletions

diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
index 334a285b93f..84b7b449cb5 100644
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@@ -680,7 +680,7 @@ def	test	t1	t1	g	g	255	4294967295	0	Y	144	0	63
 g
 select asbinary(g) from t1;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def					asbinary(g)	252	8192	0	Y	128	0	63
+def					asbinary(g)	252	4294967295	0	Y	128	0	63
 asbinary(g)
 drop table t1;
 create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b));
@@ -730,69 +730,6 @@ point(b, b) IS NULL	linestring(b) IS NULL	polygon(b) IS NULL	multipoint(b) IS NU
 1	1	1	1	1	1	1
 0	1	1	1	1	1	1
 drop table t1;
-select (asWKT(geomfromwkb((0x000000000140240000000000004024000000000000))));
-(asWKT(geomfromwkb((0x000000000140240000000000004024000000000000))))
-POINT(10 10)
-select (asWKT(geomfromwkb((0x010100000000000000000024400000000000002440))));
-(asWKT(geomfromwkb((0x010100000000000000000024400000000000002440))))
-POINT(10 10)
-create table t1 (g GEOMETRY);
-select * from t1;
-Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	test	t1	t1	g	g	255	4294967295	0	Y	144	0	63
-g
-select asbinary(g) from t1;
-Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def					asbinary(g)	252	4294967295	0	Y	128	0	63
-asbinary(g)
-drop table t1;
-create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b));
-alter table t1 disable keys;
-load data infile '../../std_data/bad_gis_data.dat' into table t1;
-ERROR 01000: Data truncated; NULL supplied to NOT NULL column 'b' at row 1
-alter table t1 enable keys;
-drop table t1;
-create table t1 (a int, b blob);
-insert into t1 values (1, ''), (2, NULL), (3, '1');
-select * from t1;
-a	b
-1	
-2	NULL
-3	1
-select
-geometryfromtext(b) IS NULL, geometryfromwkb(b) IS NULL, astext(b) IS NULL, 
-aswkb(b) IS NULL, geometrytype(b) IS NULL, centroid(b) IS NULL,
-envelope(b) IS NULL, startpoint(b) IS NULL, endpoint(b) IS NULL,
-exteriorring(b) IS NULL, pointn(b, 1) IS NULL, geometryn(b, 1) IS NULL,
-interiorringn(b, 1) IS NULL, multipoint(b) IS NULL, isempty(b) IS NULL,
-issimple(b) IS NULL, isclosed(b) IS NULL, dimension(b) IS NULL,
-numgeometries(b) IS NULL, numinteriorrings(b) IS NULL, numpoints(b) IS NULL,
-area(b) IS NULL, glength(b) IS NULL, srid(b) IS NULL, x(b) IS NULL, 
-y(b) IS NULL
-from t1;
-geometryfromtext(b) IS NULL	geometryfromwkb(b) IS NULL	astext(b) IS NULL	aswkb(b) IS NULL	geometrytype(b) IS NULL	centroid(b) IS NULL	envelope(b) IS NULL	startpoint(b) IS NULL	endpoint(b) IS NULL	exteriorring(b) IS NULL	pointn(b, 1) IS NULL	geometryn(b, 1) IS NULL	interiorringn(b, 1) IS NULL	multipoint(b) IS NULL	isempty(b) IS NULL	issimple(b) IS NULL	isclosed(b) IS NULL	dimension(b) IS NULL	numgeometries(b) IS NULL	numinteriorrings(b) IS NULL	numpoints(b) IS NULL	area(b) IS NULL	glength(b) IS NULL	srid(b) IS NULL	x(b) IS NULL	y(b) IS NULL
-1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1
-1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1
-1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1
-select 
-within(b, b) IS NULL, contains(b, b) IS NULL, overlaps(b, b) IS NULL, 
-equals(b, b) IS NULL, disjoint(b, b) IS NULL, touches(b, b) IS NULL, 
-intersects(b, b) IS NULL, crosses(b, b) IS NULL
-from t1;
-within(b, b) IS NULL	contains(b, b) IS NULL	overlaps(b, b) IS NULL	equals(b, b) IS NULL	disjoint(b, b) IS NULL	touches(b, b) IS NULL	intersects(b, b) IS NULL	crosses(b, b) IS NULL
-1	1	1	1	1	1	1	1
-1	1	1	1	1	1	1	1
-1	1	1	1	1	1	1	1
-select 
-point(b, b) IS NULL, linestring(b) IS NULL, polygon(b) IS NULL, multipoint(b) IS NULL, 
-multilinestring(b) IS NULL, multipolygon(b) IS NULL, 
-geometrycollection(b) IS NULL
-from t1;
-point(b, b) IS NULL	linestring(b) IS NULL	polygon(b) IS NULL	multipoint(b) IS NULL	multilinestring(b) IS NULL	multipolygon(b) IS NULL	geometrycollection(b) IS NULL
-0	1	1	1	1	1	1
-1	1	1	1	1	1	1
-0	1	1	1	1	1	1
-drop table t1;
 CREATE TABLE t1(a POINT) ENGINE=MyISAM;
 INSERT INTO t1 VALUES (NULL);
 SELECT * FROM t1;
@@ -1020,3 +957,4 @@ COUNT(*)
 2
 DROP TABLE t1, t2;
 End of 5.0 tests
+End of 5.0 tests