Commit e4dc9a8e authored by unknown's avatar unknown

merging fix


mysql-test/r/gis.result:
  result fixed
mysql-test/t/gis.test:
  test fixed
parent d04f74b7
......@@ -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)');
......
......@@ -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)');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment