diff options
| -rw-r--r-- | sql/spatial.cc | 2 | ||||
| -rw-r--r-- | sql/spatial.h | 2 | ||||
| -rw-r--r-- | sql/sql_type_geom.cc | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/sql/spatial.cc b/sql/spatial.cc index 13fff34df21..b879b603b67 100644 --- a/sql/spatial.cc +++ b/sql/spatial.cc @@ -144,8 +144,6 @@ int MBR::within(const MBR *mbr) /***************************** Gis_class_info *******************************/ -String Geometry::bad_geometry_data("Bad object", &my_charset_bin); - Geometry::Class_info *Geometry::ci_collection[Geometry::wkb_last+1]= { NULL, NULL, NULL, NULL, NULL, NULL, NULL diff --git a/sql/spatial.h b/sql/spatial.h index 42c4a760db2..7b33529ee94 100644 --- a/sql/spatial.h +++ b/sql/spatial.h @@ -227,8 +227,6 @@ public: static void operator delete(void *buffer) {} - static String bad_geometry_data; - enum wkbType { wkb_point= 1, diff --git a/sql/sql_type_geom.cc b/sql/sql_type_geom.cc index 9d6bc3846cc..c9263f32bc9 100644 --- a/sql/sql_type_geom.cc +++ b/sql/sql_type_geom.cc @@ -841,8 +841,6 @@ int Field_geom::store(const char *from, size_t length, CHARSET_INFO *cs) bzero(ptr, Field_blob::pack_length()); else { - if (from == Geometry::bad_geometry_data.ptr()) - goto err; // Check given WKB uint32 wkb_type; if (length < SRID_SIZE + WKB_HEADER_SIZE + 4) |