bzr commit into mysql-5.5-telco-7.0 branch (magnus.blaudd:3106)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/tmp/hwyOe_6oOG/5.5-telco-7.0/ based on revid:magnus.blaudd@stripped-ldsiye7og8uwoeki

 3106 Magnus Blåudd	2010-11-09 [merge]
      Merge 7.0 -> 5.5-telco-7.0

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2010-11-08 15:37:40 +0000
+++ b/sql/ha_ndbcluster.cc	2010-11-09 12:09:48 +0000
@@ -6710,6 +6710,7 @@ int ndbcluster_commit(handlerton *hton, 
     if (thd_ndb->m_handler &&
         thd_ndb->m_handler->m_read_before_write_removal_possible)
     {
+#ifndef NDB_WITHOUT_READ_BEFORE_WRITE_REMOVAL
       /* Autocommit with read-before-write removal
        * Some operations in this autocommitted statement have not
        * yet been executed
@@ -6754,6 +6755,9 @@ int ndbcluster_commit(handlerton *hton, 
         /* Modify execution result + optionally message */
         thd->main_da.modify_affected_rows(affected, msg);
       }
+#else
+      abort(); // Should never come here without rbwr support
+#endif
     }
     else
       res= execute_commit(thd_ndb, trans, THDVAR(thd, force_send), FALSE);

No bundle (reason: revision is a merge).