From: Jorgen Loland
Date: December 17 2010 9:19am
Subject: bzr push into mysql-5.5-bugteam branch (jorgen.loland:3207 to 3208) Bug#58985
List-Archive: http://lists.mysql.com/commits/127147
X-Bug: 58985
Message-Id: <20101217091916.891F976B@atum21.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3208 Jorgen Loland	2010-12-17
      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.

    modified:
      sql/sql_select.cc
 3207 Luis Soares	2010-12-17 [merge]
      BUG#46166
      
      Automerge from mysql-5.1-bugteam.

    modified:
      mysql-test/suite/binlog/r/binlog_index.result
      mysql-test/suite/binlog/t/binlog_index.test
      mysql-test/suite/rpl/r/rpl_binlog_errors.result
      mysql-test/suite/rpl/t/rpl_binlog_errors.test
      sql/log.cc
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2010-12-16 18:43:21 +0000
+++ b/sql/sql_select.cc	2010-12-17 09:02:24 +0000
@@ -6504,7 +6504,6 @@ make_join_select(JOIN *join,SQL_SELECT *
               ((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: useless for push emails).