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/unireg.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/unireg.cc')
| -rw-r--r-- | sql/unireg.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index fc948ddd5a6..6ebba313442 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -471,7 +471,12 @@ static bool pack_fields(File file,List<create_field> &create_fields) buff[12]= (uchar) field->interval_id; buff[13]= (uchar) field->sql_type; if (field->sql_type == FIELD_TYPE_GEOMETRY) + { buff[14]= (uchar) field->geom_type; +#ifndef HAVE_SPATIAL + DBUG_ASSERT(0); // Should newer happen +#endif + } else if (field->charset) buff[14]= (uchar) field->charset->number; else |