diff options
| author | unknown <holyfoot/hf@deer.(none)> | 2006-12-07 15:23:39 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@deer.(none)> | 2006-12-07 15:23:39 +0400 |
| commit | 893055bed6828ef4330b06b36ca6397cfa73fc3c (patch) | |
| tree | 988ff14e421b45fb96333f4f690b3ce5d9ac9e58 | |
| parent | e7efe2a9e2c0caac67580a6869658c379d33f7da (diff) | |
| parent | e8be5f6d50cf87ca36f77c08a6ab76688aca411d (diff) | |
| download | mariadb-git-893055bed6828ef4330b06b36ca6397cfa73fc3c.tar.gz | |
Merge mysql.com:/home/hf/work/pfix/my50-pfix
into mysql.com:/home/hf/work/pfix/my51-pfix
mysql-test/r/gis.result:
Auto merged
mysql-test/t/gis.test:
Auto merged
| -rw-r--r-- | mysql-test/r/gis.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/gis.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index 5ef06688ee6..a7de84796b1 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -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 set to default value; NULL supplied to NOT NULL column 'b' at row 1 alter table t1 enable keys; drop table t1; diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test index a9840c9b3b4..95fdf642b94 100644 --- a/mysql-test/t/gis.test +++ b/mysql-test/t/gis.test @@ -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; |