diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-08-12 11:47:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-08-12 12:02:23 +0200 |
| commit | 0aa9b03393f515d7b07c3139756c2a9270501c97 (patch) | |
| tree | 074514d29d2db5045db04fb838506b3eb5d456e9 /sql/opt_range.cc | |
| parent | 655cba619d2e6556d4a7c6a3b9127f248bb8e5a0 (diff) | |
| parent | 4cbf77e16ef9324acf85c01bc63023d62b821752 (diff) | |
| download | mariadb-git-0aa9b03393f515d7b07c3139756c2a9270501c97.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index d3f8acd8350..f10d6dbcfcc 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -7517,9 +7517,8 @@ SEL_TREE *Item_bool_func::get_full_func_mm_tree(RANGE_OPT_PARAM *param, param->current_table); #ifdef HAVE_SPATIAL Field::geometry_type sav_geom_type; - LINT_INIT_STRUCT(sav_geom_type); - - if (field_item->field->type() == MYSQL_TYPE_GEOMETRY) + const bool geometry= field_item->field->type() == MYSQL_TYPE_GEOMETRY; + if (geometry) { sav_geom_type= ((Field_geom*) field_item->field)->geom_type; /* We have to be able to store all sorts of spatial features here */ @@ -7554,7 +7553,7 @@ SEL_TREE *Item_bool_func::get_full_func_mm_tree(RANGE_OPT_PARAM *param, } #ifdef HAVE_SPATIAL - if (field_item->field->type() == MYSQL_TYPE_GEOMETRY) + if (geometry) { ((Field_geom*) field_item->field)->geom_type= sav_geom_type; } |