bzr push into mysql-trunk-cluster branch (ole.john.aske:3407 to 3408)

[Ole John Aske]

 3408 Ole John Aske	2011-11-15
      Fixed a problem in the new MRR implementation which caused ha_ndbcluster::multi_range_read_next() to 
      loop forever when it was iterating an empty set of ranges.

    modified:
      sql/ha_ndbcluster.cc
 3407 Frazer Clement	2011-11-11
      mysql-trunk-cluster replication testcases fixes
      
      Accomodate various differences in mysql-trunk-cluster.

    added:
      mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_innodb-slave.opt
      mysql-test/suite/ndb_rpl/t/ndb_rpl_stm_innodb-slave.opt
    renamed:
      mysql-test/include/show_binlog_using_logname.inc => mysql-test/suite/ndb_rpl/t/show_binlog_using_logname.inc
    modified:
      mysql-test/suite/ndb_rpl/r/ndb_rpl_circular.result
      mysql-test/suite/ndb_rpl/t/ndb_rpl_circular.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_gap_event.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb2ndb-slave.opt
      mysql-test/suite/ndb_rpl/t/ndb_rpl_skip_gap_event.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_xxx_innodb.inc
      mysql-test/suite/ndb_rpl/t/show_binlog_using_logname.inc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-11-10 14:08:18 +0000
+++ b/sql/ha_ndbcluster.cc	2011-11-15 12:35:56 +0000
@@ -15317,16 +15317,16 @@ int ha_ndbcluster::multi_range_read_next
         multi_range_next_entry(m_multi_range_result_ptr, table_share->reclength);
     }
 
-  if (first_running_range == ranges_in_seq)
-    DBUG_RETURN(HA_ERR_END_OF_FILE);
+    if (m_range_res)   // mrr_funcs.next() has consumed all ranges.
+      DBUG_RETURN(HA_ERR_END_OF_FILE);
 
-  /*
-    Read remaining ranges
-  */
-  if ((res= multi_range_start_retrievals(first_running_range)))
-    DBUG_RETURN(res);
+    /*
+      Read remaining ranges
+    */
+    if ((res= multi_range_start_retrievals(first_running_range)))
+      DBUG_RETURN(res);
 
-  }
+  } // for(;;)
 }
 
 

No bundle (reason: useless for push emails).