1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed not used object Geometry::bad_geometry_data()

Browse Source
This commit is contained in:
Monty 2020-08-14 21:13:52 +03:00 committed by Sergei Golubchik
parent 61822a9b5f
commit c6bf04ab2e
3 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/spatial.cc
View File

@ -144,8 +144,6 @@ int MBR::within(const MBR *mbr)
/***************************** Gis_class_info *******************************/ /***************************** Gis_class_info *******************************/
String Geometry::bad_geometry_data("Bad object", &my_charset_bin);
Geometry::Class_info *Geometry::ci_collection[Geometry::wkb_last+1]= Geometry::Class_info *Geometry::ci_collection[Geometry::wkb_last+1]=
{ {
NULL, NULL, NULL, NULL, NULL, NULL, NULL NULL, NULL, NULL, NULL, NULL, NULL, NULL

2
sql/spatial.h
View File

@ -227,8 +227,6 @@ public:
static void operator delete(void *buffer) static void operator delete(void *buffer)
{} {}
static String bad_geometry_data;
enum wkbType enum wkbType
{ {
wkb_point= 1, wkb_point= 1,

2
sql/sql_type_geom.cc
View File

@ -841,8 +841,6 @@ int Field_geom::store(const char *from, size_t length, CHARSET_INFO *cs)
bzero(ptr, Field_blob::pack_length()); bzero(ptr, Field_blob::pack_length());
else else
{ {
if (from == Geometry::bad_geometry_data.ptr())
goto err;
// Check given WKB // Check given WKB
uint32 wkb_type; uint32 wkb_type;
if (length < SRID_SIZE + WKB_HEADER_SIZE + 4) if (length < SRID_SIZE + WKB_HEADER_SIZE + 4)