summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElena Stepanova <elenst@montyprogram.com>2015-03-20 15:45:49 +0200
committerElena Stepanova <elenst@montyprogram.com>2015-03-20 15:45:49 +0200
commit138046368c5354c9f364167627f39408bef95fa7 (patch)
tree3ff0585ba2e2f17c5879664bbe52a69f66bbc07c
parent9253064c0547b16b867565a05f8305780c2ecc34 (diff)
downloadmariadb-git-bb-5.5-mdev6735.tar.gz
MDEV-6735 Range checked for each record used with keybb-5.5-mdev6735
Patch contributed by Daniel Black Remove records >= 100L test to use a Range checked for each record over a range join fixing mdev 7786/6735
-rw-r--r--sql/sql_select.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 8a53b98d812..01c811bebcf 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -9016,9 +9016,7 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond)
!sel->needed_reg.is_subset(tab->checked_keys))
{
tab->use_quick= (!sel->needed_reg.is_clear_all() &&
- (sel->quick_keys.is_clear_all() ||
- (sel->quick &&
- (sel->quick->records >= 100L)))) ?
+ sel->quick_keys.is_clear_all()) ?
2 : 1;
sel->read_tables= used_tables & ~current_map;
sel->quick_keys.clear_all();