summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <holyfoot/hf@hfmain.(none)>2007-11-24 15:02:29 +0400
committerunknown <holyfoot/hf@hfmain.(none)>2007-11-24 15:02:29 +0400
commitc58de28410ed42e684b115c5b18550cd66be52db (patch)
tree8bbb78671f7e17320d6d6b85779d8f4f7a949c94 /mysql-test/r
parent10c1aa796a32829cdf30c084a575be3a7c1f5abf (diff)
parente4dc9a8e6e13405859afda2d472e4cc4b6dc169c (diff)
downloadmariadb-git-c58de28410ed42e684b115c5b18550cd66be52db.tar.gz
Merge bk@192.168.21.1:mysql-5.0-opt
into mysql.com:/home/hf/work/30284/my50-30284 mysql-test/r/gis.result: merging mysql-test/t/gis.test: merging
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/gis.result8
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
index 953dd94be7a..ac6356f8203 100644
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@@ -766,6 +766,14 @@ geomdatawkb longblob YES NULL
drop table t1;
drop table t2;
drop table t3;
+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;