summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorRamil Kalimullin <ramil@mysql.com>2009-10-21 14:04:08 +0500
committerRamil Kalimullin <ramil@mysql.com>2009-10-21 14:04:08 +0500
commit256e3ec03b5af14361cd390fc71526aabee5db04 (patch)
tree5c88252db7115ce6221aeaee6f8a06fddb68c51c /sql/sql_select.cc
parent6af83cbc319d5f7d27ed15c72b51310b712385ba (diff)
downloadmariadb-git-256e3ec03b5af14361cd390fc71526aabee5db04.tar.gz
Fix for bug#47019: Assertion failed: 0, file .\rt_mbr.c,
line 138 when forcing a spatial index Problem: "Spatial indexes can be involved in the search for queries that use a function such as MBRContains() or MBRWithin() in the WHERE clause". Using spatial indexes for JOINs with =, <=> etc. predicates is incorrect. Fix: disable spatial indexes for such queries.
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 76d6833de5c..3bf67299d58 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -3447,7 +3447,7 @@ add_key_part(DYNAMIC_ARRAY *keyuse_array,KEY_FIELD *key_field)
{
if (!(form->keys_in_use_for_query.is_set(key)))
continue;
- if (form->key_info[key].flags & HA_FULLTEXT)
+ if (form->key_info[key].flags & (HA_FULLTEXT | HA_SPATIAL))
continue; // ToDo: ft-keys in non-ft queries. SerG
uint key_parts= (uint) form->key_info[key].key_parts;