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

[jonas oreland]

 4471 jonas oreland	2011-08-19 [merge]
      ndb - merge 63 to 70

    modified:
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
 4470 jonas oreland	2011-08-19 [merge]
      ndb - merge 63 to 70

    modified:
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2011-08-19 07:57:27 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2011-08-19 08:21:21 +0000
@@ -17545,7 +17545,8 @@ Dbdih::execDUMP_STATE_ORD(Signal* signal
     }
   }
 
-  if(arg == 7019 && signal->getLength() == 2)
+  if(arg == 7019 && signal->getLength() == 2 &&
+     signal->theData[1] < MAX_NDB_NODES)
   {
     char buf2[8+1];
     NodeRecordPtr nodePtr;

=== modified file 'storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp'
--- a/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2011-07-04 13:40:57 +0000
+++ b/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2011-08-19 08:21:21 +0000
@@ -2972,26 +2972,6 @@ void Qmgr::checkStartInterface(Signal* s
                                    nodePtr.p->m_failconf_blocks[3],
                                    nodePtr.p->m_failconf_blocks[4]);
               warningEvent("%s", buf);
-
-              for (Uint32 i = 0; i<NDB_ARRAY_SIZE(nodePtr.p->m_failconf_blocks);
-                   i++)
-              {
-                jam();
-                if (nodePtr.p->m_failconf_blocks[i] != 0)
-                {
-                  jam();
-                  signal->theData[0] = 7019;
-                  signal->theData[1] = nodePtr.i;
-                  sendSignal(numberToRef(nodePtr.p->m_failconf_blocks[i],
-                                         getOwnNodeId()),
-                             GSN_DUMP_STATE_ORD, signal, 2, JBB);
-                }
-                else
-                {
-                  jam();
-                  break;
-                }
-              }
             }
           }
 	}

No bundle (reason: useless for push emails).