Commit e8be5f6d authored by unknown's avatar unknown
Browse files

merging fix 


mysql-test/r/gis.result:
  result fixed
mysql-test/t/gis.test:
  path to datafile fixed
parent 7341315d

mysql-test/r/gis.result

+1 −1
Original line number Diff line number Diff line
@@ -685,7 +685,7 @@ asbinary(g) 
drop table t1;

create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b));

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

alter table t1 enable keys;

drop table t1;

mysql-test/t/gis.test

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ drop table t1; 
create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b));

alter table t1 disable keys;

--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;

drop table t1;