diff options
| author | dkatz@damien-katzs-computer.local <> | 2007-10-01 12:33:59 -0400 |
|---|---|---|
| committer | dkatz@damien-katzs-computer.local <> | 2007-10-01 12:33:59 -0400 |
| commit | 2034df1553c4d772d0291992e968b5d2ec56015c (patch) | |
| tree | 965eb27a1434e4535e5dd3849b061e0636254bb6 /sql/item.cc | |
| parent | 7328999fd798c2decb3f7be00ce181b7bfdb2d78 (diff) | |
| parent | 040e520d55598170fa80d53936812f14a5d9f4fd (diff) | |
| download | mariadb-git-2034df1553c4d772d0291992e968b5d2ec56015c.tar.gz | |
Merge damien-katzs-computer.local:/Users/dkatz/bug29772/my50-bug29772
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 66379d5dcf9..b44927f8da6 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -4357,12 +4357,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 */ } } @@ -6482,10 +6484,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 */ } |