Skip to content

M
mariadb
Commit 4f0c9c43 authored by holyfoot/hf@mysql.com/deer.(none)'s avatar holyfoot/hf@mysql.com/deer.(none)
Browse files
Options

merging fix

parent 9203d434
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
mysql-test/r/gis.result
View file @ 4f0c9c43
...@@ -685,7 +685,7 @@ asbinary(g) ...@@ -685,7 +685,7 @@ asbinary(g)
drop table t1; drop table t1;
create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b)); create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b));
alter table t1 disable keys; alter table t1 disable keys;
load data infile '../../std_data/bad_gis_data.dat' into table t1; load data infile '../std_data_ln/bad_gis_data.dat' into table t1;
ERROR 22004: Column was set to data type implicit default; NULL supplied for NOT NULL column 'b' at row 1 ERROR 22004: Column was set to data type implicit default; NULL supplied for NOT NULL column 'b' at row 1
alter table t1 enable keys; alter table t1 enable keys;
drop table t1; drop table t1;
......
mysql-test/t/gis.test
View file @ 4f0c9c43
...@@ -385,7 +385,7 @@ drop table t1; ...@@ -385,7 +385,7 @@ drop table t1;
create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b)); create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b));
alter table t1 disable keys; alter table t1 disable keys;
--error 1263 --error 1263
load data infile '../../std_data/bad_gis_data.dat' into table t1; load data infile '../std_data_ln/bad_gis_data.dat' into table t1;
alter table t1 enable keys; alter table t1 enable keys;
drop table t1; drop table t1;
......
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