diff options
| author | unknown <hf@deer.(none)> | 2004-01-15 21:06:22 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-01-15 21:06:22 +0400 |
| commit | 235f1a4d60968bd9083780d13e249aad9fe7120c (patch) | |
| tree | 24c233c602a5644cbcc259252d10163dc0551fc5 /sql/table.cc | |
| parent | 24f8054460a574660730024690786b877afccfd3 (diff) | |
| download | mariadb-git-235f1a4d60968bd9083780d13e249aad9fe7120c.tar.gz | |
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
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc index 912c133e571..724921c956b 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -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 { |