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:
@ -405,8 +405,13 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag,
|
||||
// charset and geometry_type share the same byte in frm
|
||||
if (field_type == FIELD_TYPE_GEOMETRY)
|
||||
{
|
||||
#ifdef HAVE_SPATIAL
|
||||
geom_type= (Field::geometry_type) strpos[14];
|
||||
charset= &my_charset_bin;
|
||||
#else
|
||||
error= 4; // unsupported field type
|
||||
goto err_not_open;
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Reference in New Issue
Block a user