=== modified file 'storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp'
--- storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2011-02-19 14:26:13 +0000
+++ storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2011-08-19 08:11:35 +0000
@@ -17337,7 +17337,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'
--- storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2011-02-01 23:27:25 +0000
+++ storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2011-08-19 08:10:38 +0000
@@ -2795,12 +2795,15 @@ void Qmgr::checkStartInterface(Signal* s
           if (((getNodeInfo(nodePtr.i).m_heartbeat_cnt + 1) % 300) == 0)
           {
             jam();
-            /**
-             * Also dump DIH nf-state
-             */
-            signal->theData[0] = 7019;
-            signal->theData[1] = nodePtr.i;
-            sendSignal(DBDIH_REF, GSN_DUMP_STATE_ORD, signal, 2, JBB);
+            if (type == NodeInfo::DB)
+            {
+              /**
+               * Also dump DIH nf-state
+               */
+              signal->theData[0] = 7019;
+              signal->theData[1] = nodePtr.i;
+              sendSignal(DBDIH_REF, GSN_DUMP_STATE_ORD, signal, 2, JBB);
+            }
           }
 	}
       }