summaryrefslogtreecommitdiff
path: root/mysql-test/r/gis-rtree.result
diff options
context:
space:
mode:
authorholyfoot/hf@deer.(none) <>2006-11-01 16:51:49 +0400
committerholyfoot/hf@deer.(none) <>2006-11-01 16:51:49 +0400
commitf8d4202c564da91a6d11c4f24c8949277469f2b6 (patch)
treec1d09d1ef971ac38f8624abb5c869029aca572e6 /mysql-test/r/gis-rtree.result
parentf698210d777a79b5efd0cd0e1e23a85b33516f13 (diff)
parent28d610dfec0599e763e52318a2f87df3154aaa60 (diff)
downloadmariadb-git-f8d4202c564da91a6d11c4f24c8949277469f2b6.tar.gz
Merge bk@192.168.21.1:mysql-5.1-opt
into mysql.com:/home/hf/work/21790/my51-21790
Diffstat (limited to 'mysql-test/r/gis-rtree.result')
-rw-r--r--mysql-test/r/gis-rtree.result7
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/gis-rtree.result b/mysql-test/r/gis-rtree.result
index dbd6783fe76..61a96afd8dc 100644
--- a/mysql-test/r/gis-rtree.result
+++ b/mysql-test/r/gis-rtree.result
@@ -862,6 +862,13 @@ CHECK TABLE t1 EXTENDED;
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)));