Skip to content

M
mariadb
Commit 7094295d authored by holyfoot/hf@mysql.com/hfmain.(none)'s avatar holyfoot/hf@mysql.com/hfmain.(none)
Browse files
Options

merging fix

parent d6e94bc9
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
mysql-test/r/gis.result
View file @ 7094295d
...@@ -742,7 +742,7 @@ select geomfromtext(col9,col89) as a from t1; ...@@ -742,7 +742,7 @@ select geomfromtext(col9,col89) as a from t1;
a a
NULL NULL
DROP TABLE t1; 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; 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)');
insert into t1 set col15 = GeomFromText('POINT(6 5)'); insert into t1 set col15 = GeomFromText('POINT(6 5)');
......
mysql-test/t/gis.test
View file @ 7094295d
...@@ -443,7 +443,7 @@ DROP TABLE t1; ...@@ -443,7 +443,7 @@ DROP TABLE t1;
# Bug #30284 spatial key corruption # 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; 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)');
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7