diff options
| author | dkatz@damien-katzs-computer.local <> | 2007-10-08 13:10:55 -0400 |
|---|---|---|
| committer | dkatz@damien-katzs-computer.local <> | 2007-10-08 13:10:55 -0400 |
| commit | b2fec8877ce2a4c492f66d8c3ab9e4f90784f11b (patch) | |
| tree | 032d69515b3423642b530d73ff9cb245d89b5370 /sql/item.cc | |
| parent | 2885d0df1556653706ee0dd70e029e6cfdb476ce (diff) | |
| parent | 2034df1553c4d772d0291992e968b5d2ec56015c (diff) | |
| download | mariadb-git-b2fec8877ce2a4c492f66d8c3ab9e4f90784f11b.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into damien-katzs-computer.local:/Users/dkatz/mysql-5.0-runtime
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc index e9b2904e3da..63628a15081 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -4363,12 +4363,14 @@ Field *Item::tmp_table_field_from_field_type(TABLE *table) return new Field_blob(max_length, maybe_null, name, table, collation.collation); break; // Blob handled outside of case +#ifdef HAVE_SPATIAL case MYSQL_TYPE_GEOMETRY: return new Field_geom(max_length, maybe_null, name, table, (Field::geometry_type) ((type() == Item::TYPE_HOLDER) ? ((Item_type_holder *)this)->get_geometry_type() : ((Item_geometry_func *)this)->get_geometry_type())); +#endif /* HAVE_SPATIAL */ } } @@ -6488,10 +6490,12 @@ Item_type_holder::Item_type_holder(THD *thd, Item *item) if (Field::result_merge_type(fld_type) == INT_RESULT) decimals= 0; prev_decimal_int_part= item->decimal_int_part(); +#ifdef HAVE_SPATIAL if (item->field_type() == MYSQL_TYPE_GEOMETRY) geometry_type= (item->type() == Item::FIELD_ITEM) ? ((Item_field *)item)->get_geometry_type() : (Field::geometry_type)((Item_geometry_func *)item)->get_geometry_type(); +#endif /* HAVE_SPATIAL */ } |