diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-07-05 20:52:59 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-07-05 20:52:59 +0400 |
| commit | a6946c55d39ffd70c47ae21df2484243a80a3f99 (patch) | |
| tree | 2c9ba7a44b4c6e3efc7706fedbbd3380086c5db9 /sql/opt_range.cc | |
| parent | 2e57c8cc706b3c03d8047225d8128c54df424415 (diff) | |
| download | mariadb-git-a6946c55d39ffd70c47ae21df2484243a80a3f99.tar.gz | |
MDEV-19972 Move GIS code from Item_bool_func::get_full_func_mm_tree() to Item_func_spatial_rel::get_mm_leaf()
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 8474349c0a8..f4bd76e4695 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -8121,16 +8121,6 @@ SEL_TREE *Item_bool_func::get_full_func_mm_tree(RANGE_OPT_PARAM *param, table_map ref_tables= 0; table_map param_comp= ~(param->prev_tables | param->read_tables | param->current_table); -#ifdef HAVE_SPATIAL - const Type_handler_geometry *sav_geom_type= NULL; - Field_geom *field_geom= dynamic_cast<Field_geom*>(field_item->field); - if (field_geom) - { - sav_geom_type= field_geom->type_handler_geom(); - /* We have to be able to store all sorts of spatial features here */ - field_geom->set_type_handler(&type_handler_geometry); - } -#endif /*HAVE_SPATIAL*/ for (uint i= 0; i < arg_count; i++) { @@ -8158,13 +8148,6 @@ SEL_TREE *Item_bool_func::get_full_func_mm_tree(RANGE_OPT_PARAM *param, } } -#ifdef HAVE_SPATIAL - if (field_geom) - { - DBUG_ASSERT(sav_geom_type); - field_geom->set_type_handler(sav_geom_type); - } -#endif /*HAVE_SPATIAL*/ DBUG_RETURN(ftree); } |