summaryrefslogtreecommitdiff
path: root/sql/item_geofunc.cc
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2017-05-02 16:24:42 +0400
committerAlexey Botchkov <holyfoot@askmonty.org>2017-05-02 16:24:42 +0400
commita60bdcba649d14bc0b0f5de23ae11dabe7aa8e7f (patch)
tree4d1c1df20c8e609bf0e003b5ef9863b187aa8653 /sql/item_geofunc.cc
parent3ea9d3e59eecadce877416218a7f7789e65ba69a (diff)
downloadmariadb-git-a60bdcba649d14bc0b0f5de23ae11dabe7aa8e7f.tar.gz
MDEV-12462 SPATIAL index fails to work with CONTAINS.
Flags are wrongly set for MBR_CONTAINS/MBR_WITHIN functions.
Diffstat (limited to 'sql/item_geofunc.cc')
-rw-r--r--sql/item_geofunc.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc
index 7ac2e054e8c..16bad154862 100644
--- a/sql/item_geofunc.cc
+++ b/sql/item_geofunc.cc
@@ -1072,11 +1072,11 @@ Item_func_spatial_rel::get_mm_leaf(RANGE_OPT_PARAM *param,
tree->max_flag= NO_MAX_RANGE;
break;
case SP_WITHIN_FUNC:
- tree->min_flag= GEOM_FLAG | HA_READ_MBR_WITHIN;// NEAR_MIN;//512;
+ tree->min_flag= GEOM_FLAG | HA_READ_MBR_CONTAIN;// NEAR_MIN;//512;
tree->max_flag= NO_MAX_RANGE;
break;
case SP_CONTAINS_FUNC:
- tree->min_flag= GEOM_FLAG | HA_READ_MBR_CONTAIN;// NEAR_MIN;//512;
+ tree->min_flag= GEOM_FLAG | HA_READ_MBR_WITHIN;// NEAR_MIN;//512;
tree->max_flag= NO_MAX_RANGE;
break;
case SP_OVERLAPS_FUNC: