bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (ole.john.aske:3313 to 3314)

[Ole John Aske]

 3314 Ole John Aske	2010-10-15
      Fixed compiler warning

    modified:
      sql/ha_ndbcluster.cc
 3313 Ole John Aske	2010-10-15
      Recommit after fixing diverged-branches:
      
      spj-svs: MRR read may fail to close cursors for pending ScanOperations 
      causing 'out of transaction / operation / lock' errors depending on the database config.
      
      This fix is cherry picked from proposed fix for bug 57481, with the addition of an
      additional SPJ test for the same scenario.

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown.result
      mysql-test/suite/ndb/r/ndb_read_multi_range.result
      mysql-test/suite/ndb/t/ndb_join_pushdown.test
      mysql-test/suite/ndb/t/ndb_read_multi_range.test
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2010-10-15 13:49:39 +0000
+++ b/sql/ha_ndbcluster.cc	2010-10-15 14:47:35 +0000
@@ -13738,7 +13738,7 @@ ha_ndbcluster::read_multi_range_first(KE
    * mrr access on this handler.
    * Close it now to free up resources for this NdbScanOperation.
    */ 
-  if (unlikely(error= close_scan()))
+  if (unlikely((error= close_scan())))
     DBUG_RETURN(error);
 
   thd_ndb->query_state|= NDB_QUERY_MULTI_READ_RANGE;


Attachment: [text/bzr-bundle] bzr/[e-mail]