From e4dc9a8e6e13405859afda2d472e4cc4b6dc169c Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 24 Nov 2007 14:57:09 +0400 Subject: [PATCH] merging fix mysql-test/r/gis.result: result fixed mysql-test/t/gis.test: test fixed --- mysql-test/r/gis.result | 2 +- mysql-test/t/gis.test | 2 +- 2 files changed, 2 insertions(+), 2 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)'); diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test index 6d7ec046c4c..d578b5c9955 100644 --- a/mysql-test/t/gis.test +++ b/mysql-test/t/gis.test @@ -443,7 +443,7 @@ DROP TABLE t1; # Bug #30284 spatial key corruption # -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)');