bzr push into mysql-5.1-telco-6.3 branch (jonas.oreland:3450 to 3451) Bug#62208

[jonas oreland]

 3451 jonas oreland	2011-08-19
      ndb - bug#62208 - don't dump data-node info, for non-data-node

    modified:
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
 3450 jonas oreland	2011-08-19
      ndb - bug#62206 - nr - startGci should not be bigger than stopGci

    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:53:05 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2011-08-19 08:16:25 +0000
@@ -15949,7 +15949,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 12:36:04 +0000
+++ b/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2011-08-19 08:16:25 +0000
@@ -2722,26 +2722,6 @@ void Qmgr::checkStartInterface(Signal* s
                                    nodePtr.p->m_failconf_blocks[2],
                                    nodePtr.p->m_failconf_blocks[3]);
               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).