bzr push into mysql-5.5-cluster-7.2 branch (jonas.oreland:3789 to 3790)

[Jonas Oreland]

 3790 Jonas Oreland	2012-01-26 [merge]
      ndb - merge 71 to 72

    modified:
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
 3789 jonas oreland	2012-01-25 [merge]
      ndb - merge 71 to 72

    modified:
      storage/ndb/src/kernel/vm/mt.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2012-01-17 15:51:25 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2012-01-26 08:15:55 +0000
@@ -3069,7 +3069,16 @@ void Dbtc::execTCKEYREQ(Signal* signal)
     case ZWRITE:
     case ZREFRESH:
       jam();
-      if (unlikely((++ regApiPtr->m_write_count) > m_max_writes_per_trans))
+      regApiPtr->m_write_count++;
+      if (regApiPtr->m_flags & ApiConnectRecord::TF_DEFERRED_CONSTRAINTS)
+      {
+        /**
+         * Allow slave applier to ignore m_max_writes_per_trans
+         */
+        break;
+      }
+
+      if (unlikely(regApiPtr->m_write_count > m_max_writes_per_trans))
       {
         TCKEY_abort(signal, 65);
         return;

No bundle (reason: useless for push emails).