diff options
| author | unknown <holyfoot/hf@deer.(none)> | 2006-12-07 09:27:47 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@deer.(none)> | 2006-12-07 09:27:47 +0400 |
| commit | 07de4b3aff88d8e0ce6ce056babdb837c4959189 (patch) | |
| tree | d29a941d0c0d4b6c045e8fb29cbb56eaa5e4522b /mysql-test/std_data | |
| parent | e2574167850d8b5611ab7421ece47f3658d9d999 (diff) | |
| parent | 7341315d7404d1a79d9fad85d8b0aad6855b88b5 (diff) | |
| download | mariadb-git-07de4b3aff88d8e0ce6ce056babdb837c4959189.tar.gz | |
Merge mysql.com:/home/hf/work/22372/my50-22372
into mysql.com:/home/hf/work/22372/my51-22372
mysql-test/t/gis.test:
Auto merged
sql/field.cc:
Auto merged
sql/sql_load.cc:
Auto merged
mysql-test/r/gis.result:
SCCS merged
sql/field.h:
merging
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/bad_gis_data.dat | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/std_data/bad_gis_data.dat b/mysql-test/std_data/bad_gis_data.dat new file mode 100644 index 00000000000..257cc5642cb --- /dev/null +++ b/mysql-test/std_data/bad_gis_data.dat @@ -0,0 +1 @@ +foo |