diff options
author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-12-06 22:02:39 +0400 |
---|---|---|
committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-12-06 22:02:39 +0400 |
commit | 8f3c395c260f40c519444441297b979a5f09f6bf (patch) | |
tree | e175bfe15e5395d0886dfa5d2e07539352f7b0f9 /mysql-test/std_data | |
parent | 85b1701ab7292eeee4ce4b253909ae68345be43c (diff) | |
parent | 63fce3a24e33407d58a17ec2946caa08e6c1b537 (diff) | |
download | mariadb-git-8f3c395c260f40c519444441297b979a5f09f6bf.tar.gz |
Merge mysql.com:/home/hf/work/22372/my41-22372
into mysql.com:/home/hf/work/22372/my50-22372
mysql-test/r/gis.result:
merging
mysql-test/t/gis.test:
merging
sql/field.cc:
merging
sql/field.h:
merging
sql/sql_load.cc:
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 |