From: Jorgen Loland
Date: December 17 2010 9:19am
Subject: bzr commit into mysql-trunk-bugfixing branch (jorgen.loland:3442) Bug#59895
List-Archive: http://lists.mysql.com/commits/127145
X-Bug: 59895
Message-Id: <20101217091905.3E60E76B@atum21.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///export/home/jl208045/mysql/mysql-trunk-bugfixing/ based on revid:luis.soares@stripped

 3442 Jorgen Loland	2010-12-17 [merge]
      BUG#59895: Merge 5.5-bugteam -> trunk-bugfixing

    modified:
      sql/sql_select.cc
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2010-12-16 19:28:42 +0000
+++ b/sql/sql_select.cc	2010-12-17 09:18:58 +0000
@@ -9658,7 +9658,6 @@ static bool make_join_select(JOIN *join,
               ((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();

No bundle (reason: revision is a merge).