mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
SCRUM:
WL#1163 (Making spatial code optional) Pack of changes to do in sql/ code. sql/field.cc: Spatial code #ifdef-ed sql/field.h: Spatial code #ifdef-ed sql/item_create.cc: Spatial code #ifdef-ed sql/item_create.h: Spatial code #ifdef-ed sql/item_geofunc.cc: Spatial code #ifdef-ed sql/item_geofunc.h: Spatial code #ifdef-ed GEOM_NEW implementation sql/lex.h: Code was significally modified to support optional group of functions sql/lex_symbol.h: SYM_GROUP structure presented sql/sql_table.cc: Spatial code #ifdef-ed sql/sql_yacc.yy: Several modifications to make spatial code optional sql/table.cc: Spatial code #ifdef-ed sql/unireg.cc: Spatial code #ifdef-ed
This commit is contained in:
@ -913,7 +913,6 @@ public:
|
||||
|
||||
|
||||
class Field_blob :public Field_str {
|
||||
bool geom_flag;
|
||||
protected:
|
||||
uint packlength;
|
||||
String value; // For temporaries
|
||||
@ -926,7 +925,7 @@ public:
|
||||
struct st_table *table_arg, CHARSET_INFO *cs)
|
||||
:Field_str((char*) 0,len_arg, maybe_null_arg ? (uchar*) "": 0,0,
|
||||
NONE, field_name_arg, table_arg, cs),
|
||||
geom_flag(true), packlength(4)
|
||||
packlength(4)
|
||||
{
|
||||
flags|= BLOB_FLAG;
|
||||
}
|
||||
@ -1001,7 +1000,7 @@ public:
|
||||
field_cast_enum field_cast_type() { return FIELD_CAST_BLOB; }
|
||||
};
|
||||
|
||||
|
||||
#ifdef HAVE_SPATIAL
|
||||
class Field_geom :public Field_blob {
|
||||
public:
|
||||
enum geometry_type geom_type;
|
||||
@ -1029,7 +1028,7 @@ public:
|
||||
void set_key_image(char *buff,uint length, CHARSET_INFO *cs);
|
||||
field_cast_enum field_cast_type() { return FIELD_CAST_GEOM; }
|
||||
};
|
||||
|
||||
#endif /*HAVE_SPATIAL*/
|
||||
|
||||
class Field_enum :public Field_str {
|
||||
protected:
|
||||
|
Reference in New Issue
Block a user