From 883a36340b1ffad3c35f914243a209ba118b7702 Mon Sep 17 00:00:00 2001 From: Jorgen Loland Date: Fri, 17 Dec 2010 13:52:39 +0100 Subject: BUG#58985: Assertion tab->quick->index != 64 failed in make_join_select() in sql_select.cc Follow-up patch. Add sanity check for quick select when it is decided that it should be used. sql/opt_range.h: Add is_valid() to QUICK_SELECT* sql/sql_select.cc: Add sanity check for quick select when it is decided that it should be used. --- sql/sql_select.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'sql/sql_select.cc') diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 6e42b65175a..e14b872d18e 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -6504,6 +6504,7 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) ((tab->type != JT_CONST && tab->type != JT_REF) || (uint)tab->ref.key == tab->quick->index)) { + DBUG_ASSERT(tab->quick->is_valid()); sel->quick=tab->quick; // Use value from get_quick_... sel->quick_keys.clear_all(); sel->needed_reg.clear_all(); -- cgit v1.2.1