diff options
author | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-24 14:47:32 +0400 |
---|---|---|
committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-24 14:47:32 +0400 |
commit | d04f74b775767374247a4053135ebe5aa7b58fdd (patch) | |
tree | 4af300ac3ed26e54133d7355283656d216ffe38f /mysql-test/r/gis.result | |
parent | 4b48eb6f1e4565ba31982f73908664108ba0fb7b (diff) | |
parent | da1efa3387e62df85d48f05e81ac9b324c455e83 (diff) | |
download | mariadb-git-d04f74b775767374247a4053135ebe5aa7b58fdd.tar.gz |
Merge mysql.com:/home/hf/work/30284/my41-30284
into mysql.com:/home/hf/work/30284/my50-30284
myisam/mi_check.c:
Auto merged
mysql-test/t/gis.test:
Auto merged
mysql-test/r/gis.result:
SCCS merged
Diffstat (limited to 'mysql-test/r/gis.result')
-rw-r--r-- | mysql-test/r/gis.result | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index 40c70721347..9c7f2bb4beb 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -742,6 +742,14 @@ select geomfromtext(col9,col89) as a from t1; a NULL DROP TABLE t1; +create table t1(col1 geometry not null,col15 geometrycollection not +null,spatial index(col15),index(col1(15)))engine=myisam; +insert into t1 set col15 = GeomFromText('POINT(6 5)'); +insert into t1 set col15 = GeomFromText('POINT(6 5)'); +check table t1 extended; +Table Op Msg_type Msg_text +test.t1 check status OK +drop table t1; End of 4.1 tests create table t1 (s1 geometry not null,s2 char(100)); create trigger t1_bu before update on t1 for each row set new.s1 = null; |