From f7dc30c843912f047fdc1d6f196228c0366b3729 Mon Sep 17 00:00:00 2001
From: Jorgen Loland <jorgen.loland@oracle.com>
Date: Fri, 17 Dec 2010 10:02:24 +0100
Subject: [PATCH] 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 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 90a8727c56c..6e42b65175a 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -6504,7 +6504,6 @@ 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->index != MAX_KEY);
 	    sel->quick=tab->quick;		// Use value from get_quick_...
 	    sel->quick_keys.clear_all();
 	    sel->needed_reg.clear_all();