bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4671 to 4672)

[Jonas Oreland]

 4672 Jonas Oreland	2011-11-17
      ndb - set correct maxFragments also for ndbd

    modified:
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
 4671 jonas oreland	2011-11-16
      ndb - yet another redo-parts fix. Since page 0 (file 0) is rewritten every time log wraps...also set ZPOS_NO_LOG_PARTS in initLogpage...

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2011-11-14 12:02:56 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2011-11-17 08:33:23 +0000
@@ -7486,7 +7486,8 @@ void Dbdih::execCREATE_FRAGMENTATION_REQ
   const Uint32 defaultFragments = 
     c_fragments_per_node * cnoOfNodeGroups * cnoReplicas;
   const Uint32 maxFragments =
-    MAX_FRAG_PER_LQH * getLqhWorkers() * cnoOfNodeGroups * cnoReplicas;
+    MAX_FRAG_PER_LQH * (getLqhWorkers() ? getLqhWorkers() : 1) *
+    cnoOfNodeGroups * cnoReplicas;
 
   do {
     NodeGroupRecordPtr NGPtr;

No bundle (reason: useless for push emails).