summaryrefslogtreecommitdiff
path: root/sql/spatial.h
diff options
context:
space:
mode:
authorunknown <hf@deer.(none)>2005-04-29 20:23:02 +0500
committerunknown <hf@deer.(none)>2005-04-29 20:23:02 +0500
commit1df25ccdac1855e82fc04b2055c193864f8b33b9 (patch)
treea1ccc4cac7fa2e450dd06586cd94df5312459b26 /sql/spatial.h
parentcfd042108a8d4a38422d965b2a1d1fc8f32f7330 (diff)
downloadmariadb-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.h')
-rw-r--r--sql/spatial.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/spatial.h b/sql/spatial.h
index b96434831a1..438ec171a72 100644
--- a/sql/spatial.h
+++ b/sql/spatial.h
@@ -173,6 +173,8 @@ public:
static void operator delete(void *ptr, void *buffer)
{}
+ static String bad_geometry_data;
+
enum wkbType
{
wkb_point= 1,