Commit 8bb59c87 authored by Jorgen Loland's avatar Jorgen Loland

BUG#58985: Assertion tab->quick->index != 64 failed in

           make_join_select() in sql_select.cc

Caused by incorrect ASSERT introduced by BUG#58456. Quick selects 
may have index == MAX_KEY if it merges indices.

sql/sql_select.cc:
  Removed ASSERT. Quick selects may have index == MAX_KEY if it merges indices.
parent fa175ad6
...@@ -6504,7 +6504,6 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) ...@@ -6504,7 +6504,6 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond)
((tab->type != JT_CONST && tab->type != JT_REF) || ((tab->type != JT_CONST && tab->type != JT_REF) ||
(uint)tab->ref.key == tab->quick->index)) (uint)tab->ref.key == tab->quick->index))
{ {
DBUG_ASSERT(tab->quick->index != MAX_KEY);
sel->quick=tab->quick; // Use value from get_quick_... sel->quick=tab->quick; // Use value from get_quick_...
sel->quick_keys.clear_all(); sel->quick_keys.clear_all();
sel->needed_reg.clear_all(); sel->needed_reg.clear_all();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment