diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-12-07 15:22:43 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-12-07 15:22:43 +0400 |
| commit | c067aa5867b06af0a9b18e6fd8466334d99df63e (patch) | |
| tree | f5a68bbdba53eb4da6cf982a300fa28e54e77cf7 | |
| parent | e5168acb98b9fd4d9582ea7a5022d4da72a346d6 (diff) | |
| download | mariadb-git-c067aa5867b06af0a9b18e6fd8466334d99df63e.tar.gz | |
merging fix
mysql-test/r/gis.result:
result fixed
mysql-test/t/gis.test:
path to datafile fixed
| -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 92386535119..870e160e563 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 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; 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; |