diff options
| author | unknown <malff@lambda.hsd1.co.comcast.net.> | 2007-10-18 16:39:55 -0600 |
|---|---|---|
| committer | unknown <malff@lambda.hsd1.co.comcast.net.> | 2007-10-18 16:39:55 -0600 |
| commit | d927461052084fc876151c42ea9502b5bf3fef4a (patch) | |
| tree | ccfb662d95d2a05ae770fc63803f610a589db2d8 /sql/item.cc | |
| parent | a634d1bf474aab88c44d448035b6a9a35d6e795d (diff) | |
| parent | 367fc73e3cf8825bdf46ac4c277afe7097652e39 (diff) | |
| download | mariadb-git-d927461052084fc876151c42ea9502b5bf3fef4a.tar.gz | |
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
mysql-test/r/udf.result:
Auto merged
mysql-test/t/udf.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/udf_example.c:
Auto merged
sql/udf_example.def:
Auto merged
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 5f73b016e50..c451fe94b29 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -4364,12 +4364,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 */ } } @@ -6489,10 +6491,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 */ } |