Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

@@ -2134,7 +2134,6 @@ void Dbdih::execINCL_NODECONF(Signal* signal)
   blocklist[3] = numberToRef(BACKUP, getOwnNodeId());
   blocklist[4] = numberToRef(SUMA, getOwnNodeId());
   
-  Uint32 i = 0;
   for (Uint32 i = 0; blocklist[i] != 0; i++)
   {
     if (TstartNode_or_blockref == blocklist[i])