summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2011-11-29 02:11:13 +0400
committerAlexey Botchkov <holyfoot@askmonty.org>2011-11-29 02:11:13 +0400
commit18d9f8d429c539b9ba7543615e54de03e8a71c96 (patch)
tree037a7d70bebfd041478d0ca94b1aecc691d2fbf7 /storage
parent62e7ab3ac7a7dc6c89308f9883610d9951d85a73 (diff)
downloadmariadb-git-18d9f8d429c539b9ba7543615e54de03e8a71c96.tar.gz
bug 857066 Wrong result with ST_DISJOINT when using an index
the ST_DISJOINT can't be properly optimized with the RTree key at the moment. per-file comments: storage/maria/ma_rt_index.c bug 857066 Wrong result with ST_DISJOINT when using an index disabled optimization for the DISJOINT case.
Diffstat (limited to 'storage')
-rw-r--r--storage/maria/ma_rt_index.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/ma_rt_index.c b/storage/maria/ma_rt_index.c
index bd1b9038ccf..f4c5b26f40a 100644
--- a/storage/maria/ma_rt_index.c
+++ b/storage/maria/ma_rt_index.c
@@ -1258,7 +1258,7 @@ ha_rows maria_rtree_estimate(MARIA_HA *info, MARIA_KEY *key, uint32 flag)
MARIA_PAGE page;
if (flag & MBR_DISJOINT)
- return info->state->records;
+ return HA_POS_ERROR;
if ((root= share->state.key_root[key->keyinfo->key_nr]) == HA_OFFSET_ERROR)
return HA_POS_ERROR;