diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2017-05-02 13:29:52 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2017-05-02 13:29:52 +0400 |
| commit | 19cbd639314a24f34917ad7c5e16ecb1f972523a (patch) | |
| tree | 1c0b13ce97144d60161a2e7f6fdd2d627d79d3ee | |
| parent | 7afcee4cf66c73ae3f9c5f04763b4b7a1d37e419 (diff) | |
| download | mariadb-git-bb-10.2-mdev9143-hf.tar.gz | |
MDEV-12462bb-10.2-mdev9143-hf
| -rw-r--r-- | mysql-test/r/gis-rt-precise.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/gis-rtree.result | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | scripts/wsrep_sst_common | 0 | ||||
| -rw-r--r-- | sql/item_geofunc.cc | 4 |
4 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/gis-rt-precise.result b/mysql-test/r/gis-rt-precise.result index 65583a0ce0d..d3308ed90ba 100644 --- a/mysql-test/r/gis-rt-precise.result +++ b/mysql-test/r/gis-rt-precise.result @@ -51,7 +51,7 @@ count(*) EXPLAIN SELECT fid, AsText(g) FROM t1 WHERE ST_Within(g, GeomFromText('Polygon((40 40,60 40,60 60,40 40))')); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range g g 34 NULL 1 Using where +1 SIMPLE t1 range g g 34 NULL 4 Using where SELECT fid, AsText(g) FROM t1 WHERE ST_Within(g, GeomFromText('Polygon((40 40,60 40,60 60,40 40))')); fid AsText(g) diff --git a/mysql-test/r/gis-rtree.result b/mysql-test/r/gis-rtree.result index b76d02ef1d7..9373237f1d6 100644 --- a/mysql-test/r/gis-rtree.result +++ b/mysql-test/r/gis-rtree.result @@ -301,7 +301,7 @@ count(*) EXPLAIN SELECT fid, AsText(g) FROM t2 WHERE Within(g, GeomFromText('Polygon((40 40,60 40,60 60,40 60,40 40))')); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range g g 34 NULL 1 Using where +1 SIMPLE t2 range g g 34 NULL 4 Using where SELECT fid, AsText(g) FROM t2 WHERE Within(g, GeomFromText('Polygon((40 40,60 40,60 60,40 60,40 40))')); fid AsText(g) diff --git a/scripts/wsrep_sst_common b/scripts/wsrep_sst_common index 466bb46b382..466bb46b382 100644..100755 --- a/scripts/wsrep_sst_common +++ b/scripts/wsrep_sst_common 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: |