Merge 4.1 with jonas irix clone

BitKeeper/etc/logging_ok:
  auto-union
ndb/include/kernel/NodeState.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/include/util/Bitmask.hpp:
  Auto merged
ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/common/util/SocketServer.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.hpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmclient/CpcClient.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/test/include/NDBT_Table.hpp:
  Auto merged
ndb/test/include/NDBT_Test.hpp:
  Auto merged
ndb/test/run-test/main.cpp:
  Auto merged
ndb/test/src/HugoOperations.cpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
ndb/test/src/NDBT_Tables.cpp:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  Auto merged
ndb/test/src/NdbRestarter.cpp:
  Auto merged
ndb/tools/waiter.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

1 files changed, 12 insertions, 10 deletions

diff --git a/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp b/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
index 176b9590c60..ef0f91841dc 100644
--- a/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
+++ b/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
@@ -1071,14 +1071,15 @@ Cmvmi::execDUMP_STATE_ORD(Signal* signal)
   }
 
   if (dumpState->args[0] == DumpStateOrd::CmvmiTestLongSigWithDelay) {
+    unsigned i;
     Uint32 loopCount = dumpState->args[1];
     const unsigned len0 = 11;
     const unsigned len1 = 123;
     Uint32 sec0[len0];
     Uint32 sec1[len1];
-    for (unsigned i = 0; i < len0; i++)
+    for (i = 0; i < len0; i++)
       sec0[i] = i;
-    for (unsigned i = 0; i < len1; i++)
+    for (i = 0; i < len1; i++)
       sec1[i] = 16 * i;
     Uint32* sig = signal->getDataPtrSend();
     sig[0] = reference();
@@ -1131,6 +1132,7 @@ static LinearSectionPtr g_test[3];
 
 void
 Cmvmi::execTESTSIG(Signal* signal){
+  Uint32 i;
   /**
    * Test of SafeCounter
    */
@@ -1155,14 +1157,14 @@ Cmvmi::execTESTSIG(Signal* signal){
 					   getOwnNodeId(),
 					   true);
     ndbout_c("-- Fixed section --");    
-    for(Uint32 i = 0; i<signal->length(); i++){
+    for(i = 0; i<signal->length(); i++){
       fprintf(stdout, "H'0x%.8x ", signal->theData[i]);
       if(((i + 1) % 6) == 0)
 	fprintf(stdout, "\n");
     }
     fprintf(stdout, "\n");
     
-    for(Uint32 i = 0; i<signal->header.m_noOfSections; i++){
+    for(i = 0; i<signal->header.m_noOfSections; i++){
       SegmentedSectionPtr ptr;
       ndbout_c("-- Section %d --", i);
       signal->getSection(ptr, i);
@@ -1175,7 +1177,7 @@ Cmvmi::execTESTSIG(Signal* signal){
   /**
    * Validate length:s
    */
-  for(Uint32 i = 0; i<signal->header.m_noOfSections; i++){
+  for(i = 0; i<signal->header.m_noOfSections; i++){
     SegmentedSectionPtr ptr;
     signal->getSection(ptr, i);
     ndbrequire(ptr.p != 0);
@@ -1220,7 +1222,7 @@ Cmvmi::execTESTSIG(Signal* signal){
   case 4:{
     LinearSectionPtr ptr[3];
     const Uint32 secs = signal->getNoOfSections();
-    for(Uint32 i = 0; i<secs; i++){
+    for(i = 0; i<secs; i++){
       SegmentedSectionPtr sptr;
       signal->getSection(sptr, i);
       ptr[i].sz = sptr.sz;
@@ -1269,7 +1271,7 @@ Cmvmi::execTESTSIG(Signal* signal){
   case 8:{
     LinearSectionPtr ptr[3];
     const Uint32 secs = signal->getNoOfSections();
-    for(Uint32 i = 0; i<secs; i++){
+    for(i = 0; i<secs; i++){
       SegmentedSectionPtr sptr;
       signal->getSection(sptr, i);
       ptr[i].sz = sptr.sz;
@@ -1303,7 +1305,7 @@ Cmvmi::execTESTSIG(Signal* signal){
       sendNextLinearFragment(signal, fragSend);
     }
     
-    for(Uint32 i = 0; i<secs; i++){
+    for(i = 0; i<secs; i++){
       delete[] ptr[i].p;
     }
     break;
@@ -1335,7 +1337,7 @@ Cmvmi::execTESTSIG(Signal* signal){
 
     const Uint32 secs = signal->getNoOfSections();
     memset(g_test, 0, sizeof(g_test));
-    for(Uint32 i = 0; i<secs; i++){
+    for(i = 0; i<secs; i++){
       SegmentedSectionPtr sptr;
       signal->getSection(sptr, i);
       g_test[i].sz = sptr.sz;
@@ -1379,7 +1381,7 @@ Cmvmi::execTESTSIG(Signal* signal){
   case 14:{
     Uint32 count = signal->theData[8];
     signal->theData[10] = count * rg.m_nodes.count();
-    for(Uint32 i = 0; i<count; i++){
+    for(i = 0; i<count; i++){
       sendSignal(rg, GSN_TESTSIG, signal, signal->length(), JBB); 
     }
     return;