diff options
| author | unknown <hf@deer.(none)> | 2005-04-29 20:23:02 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2005-04-29 20:23:02 +0500 |
| commit | 1df25ccdac1855e82fc04b2055c193864f8b33b9 (patch) | |
| tree | a1ccc4cac7fa2e450dd06586cd94df5312459b26 /sql/spatial.cc | |
| parent | cfd042108a8d4a38422d965b2a1d1fc8f32f7330 (diff) | |
| download | mariadb-git-1df25ccdac1855e82fc04b2055c193864f8b33b9.tar.gz | |
Fix for #6553 and #8776 (no errors on bad spatial data)
mysql-test/r/gis-rtree.result:
test result fixed
mysql-test/r/gis.result:
test result fixed
mysql-test/t/gis-rtree.test:
test case fixed
mysql-test/t/gis.test:
test case added
sql/field.cc:
error messages launched now when we try to put bad spatial
data in the GEOMETRY field
sql/field.h:
interface fixed
sql/item_geofunc.cc:
bad_data sign now instead of NULL now returned from
Item_geometry_from_text::val_str
sql/share/errmsg.txt:
error message added
sql/spatial.cc:
bad_geometry data instance
sql/spatial.h:
bad_geometry_data declaration
sql/sql_base.cc:
messages now created in store_* function
Diffstat (limited to 'sql/spatial.cc')
| -rw-r--r-- | sql/spatial.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/spatial.cc b/sql/spatial.cc index bcfefd9dde8..427648850e4 100644 --- a/sql/spatial.cc +++ b/sql/spatial.cc @@ -22,6 +22,8 @@ /***************************** Gis_class_info *******************************/ +String Geometry::bad_geometry_data("Bad object", &my_charset_bin); + Geometry::Class_info *Geometry::ci_collection[Geometry::wkb_end+1]= { NULL, NULL, NULL, NULL, NULL, NULL, NULL |