diff options
author | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-24 14:57:51 +0400 |
---|---|---|
committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-24 14:57:51 +0400 |
commit | ff5120f0fe52264ca276767554439cb3ba48d46a (patch) | |
tree | bd8c719a9b0becd61cd45d10ab90993b5dba82bc /mysql-test/r/gis.result | |
parent | 13c64257d99dd9c41ac33ecbcac8086e3f2eabbe (diff) | |
parent | e4dc9a8e6e13405859afda2d472e4cc4b6dc169c (diff) | |
download | mariadb-git-ff5120f0fe52264ca276767554439cb3ba48d46a.tar.gz |
Merge mysql.com:/home/hf/work/30284/my50-30284
into mysql.com:/home/hf/work/30284/my51-30284
mysql-test/r/gis.result:
Auto merged
mysql-test/t/gis.test:
Auto merged
storage/myisam/mi_check.c:
Auto 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 61394409947..ef33aada6a6 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 default 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; |