Commit 9f75d43e authored by unknown's avatar unknown
Browse files

merging 


mysql-test/r/gis-rtree.result:
  merging fix
parent f9c6368e

mysql-test/r/gis-rtree.result

+8 −7
Original line number Diff line number Diff line
@@ -863,13 +863,6 @@ Table Op Msg_type Msg_text 
test.t1	check	status	OK

DROP TABLE t1;

CREATE TABLE t1 (foo GEOMETRY NOT NULL, SPATIAL INDEX(foo) );

INSERT INTO t1(foo) VALUES (NULL);

ERROR 23000: Column 'foo' cannot be null

INSERT INTO t1() VALUES ();

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

INSERT INTO t1(foo) VALUES ('');

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

CREATE TABLE t1 (foo GEOMETRY NOT NULL, SPATIAL INDEX(foo) );

INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(1,1)));

INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(1,0)));

INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(0,1)));
@@ -880,3 +873,11 @@ SELECT 1 FROM t1 WHERE foo != PointFromWKB(POINT(0,0)); 
1

1

DROP TABLE t1;

CREATE TABLE t1(foo GEOMETRY NOT NULL, SPATIAL INDEX(foo) );

INSERT INTO t1(foo) VALUES (NULL);

ERROR 23000: Column 'foo' cannot be null

INSERT INTO t1() VALUES ();

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

INSERT INTO t1(foo) VALUES ('');

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

DROP TABLE t1;