1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/home/hf/work/pfix/my50-pfix

Browse Source 
into  mysql.com:/home/hf/work/pfix/my51-pfix
This commit is contained in:
holyfoot/hf@deer.(none) 2006-12-07 15:23:39 +04:00
commit 883aa8d980
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/gis.result
View File

@ -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 set to default value; NULL supplied to NOT NULL column 'b' at row 1 ERROR 22004: Column set to default value; NULL supplied to NOT NULL column 'b' at row 1
alter table t1 enable keys; alter table t1 enable keys;
drop table t1; drop table t1;

2
mysql-test/t/gis.test
View File

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