summaryrefslogtreecommitdiff
path: root/storage/myisam
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2011-11-29 15:27:52 +0400
committerAlexey Botchkov <holyfoot@askmonty.org>2011-11-29 15:27:52 +0400
commitcdde6187d1d2e7f407043f73376c266f540217d9 (patch)
tree5df73a2bde641a5ef478f942faf721d36e342416 /storage/myisam
parent18d9f8d429c539b9ba7543615e54de03e8a71c96 (diff)
downloadmariadb-git-cdde6187d1d2e7f407043f73376c266f540217d9.tar.gz
bug 857066 Wrong result with ST_DISJOINT when using an index.
DISJOINT can't be properly optimized with the RTree keys in MyISAM also. per-file comments: storage/myisam/rt_index.c bug 857066 Wrong result with ST_DISJOINT when using an index. don't optimize DISJOINT with the RTree keys.
Diffstat (limited to 'storage/myisam')
-rw-r--r--storage/myisam/rt_index.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisam/rt_index.c b/storage/myisam/rt_index.c
index 6a825bab1fa..06d4ab9ccce 100644
--- a/storage/myisam/rt_index.c
+++ b/storage/myisam/rt_index.c
@@ -1028,7 +1028,7 @@ ha_rows rtree_estimate(MI_INFO *info, uint keynr, uchar *key,
ha_rows res = 0;
if (flag & MBR_DISJOINT)
- return info->state->records;
+ return HA_POS_ERROR;
if ((root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR)
return HA_POS_ERROR;