diff options
| author | unknown <holyfoot/hf@deer.(none)> | 2006-11-01 16:51:49 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@deer.(none)> | 2006-11-01 16:51:49 +0400 |
| commit | 022da394dc4e0551f9a83663591ab29d85225b59 (patch) | |
| tree | c1d09d1ef971ac38f8624abb5c869029aca572e6 /mysql-test/r/gis-rtree.result | |
| parent | decb5791a37c727a685a776605cdc00e836e4b57 (diff) | |
| parent | c5453a83a7ab6f99ce0853003748cf61fdc66ddb (diff) | |
| download | mariadb-git-022da394dc4e0551f9a83663591ab29d85225b59.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-opt
into mysql.com:/home/hf/work/21790/my51-21790
mysql-test/t/gis-rtree.test:
Auto merged
sql/handler.cc:
Auto merged
mysql-test/r/gis-rtree.result:
merging
Diffstat (limited to 'mysql-test/r/gis-rtree.result')
| -rw-r--r-- | mysql-test/r/gis-rtree.result | 7 |
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))); |