summaryrefslogtreecommitdiff
path: root/mysql-test/r/gis.result
diff options
context:
space:
mode:
authorunknown <holyfoot/hf@mysql.com/hfmain.(none)>2007-11-24 14:57:09 +0400
committerunknown <holyfoot/hf@mysql.com/hfmain.(none)>2007-11-24 14:57:09 +0400
commite4dc9a8e6e13405859afda2d472e4cc4b6dc169c (patch)
treec26cf9573a38c707b2a4022659468922ccdee65c /mysql-test/r/gis.result
parentd04f74b775767374247a4053135ebe5aa7b58fdd (diff)
downloadmariadb-git-e4dc9a8e6e13405859afda2d472e4cc4b6dc169c.tar.gz
merging fix
mysql-test/r/gis.result: result fixed mysql-test/t/gis.test: test fixed
Diffstat (limited to 'mysql-test/r/gis.result')
-rw-r--r--mysql-test/r/gis.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
index 9c7f2bb4beb..4334a34c3ff 100644
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@@ -742,7 +742,7 @@ select geomfromtext(col9,col89) as a from t1;
a
NULL
DROP TABLE t1;
-create table t1(col1 geometry not null,col15 geometrycollection not
+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)');