bzr push into mysql-trunk-bugfixing branch (jorgen.loland:3441 to 3442) Bug#59895

[Jorgen Loland]

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

    modified:
      sql/sql_select.cc
 3441 Luis Soares	2010-12-17 [merge]
      BUG#46166
      
      Manual merge from mysql-5.5-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/binlog.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: useless for push emails).