diff options
author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-11-06 11:16:13 +0400 |
---|---|---|
committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-11-06 11:16:13 +0400 |
commit | 10dd1a371d7c5b99f965ca0bde409baadc772240 (patch) | |
tree | 88ab2db3f92d6eb6d42d2642475766bf609e99ee /mysql-test/r/gis-rtree.result | |
parent | 4eeef03c4c6683c5a8e9b30ded1ad8576a83bba1 (diff) | |
parent | b8ab82a6294228c65f1ac2a3b3efa82a5abc1dc8 (diff) | |
download | mariadb-git-10dd1a371d7c5b99f965ca0bde409baadc772240.tar.gz |
Merge abotchkov@production.mysql.com:mysql-5.0-opt
into mysql.com:/home/hf/work/21790/my50-21790
mysql-test/t/gis-rtree.test:
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 e017a31f24b..64b21ca988d 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))); |