Merge joreland@bk-internal.mysql.com:irix

into eel.hemma.oreland.se:/ndb/clone-mysql-4.1-ndb-daily-2004-08-04


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/test/ndbapi/testBasic.cpp:
  Auto merged
ndb/test/run-test/main.cpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

1 files changed, 11 insertions, 11 deletions

diff --git a/ndb/test/ndbapi/testBasic.cpp b/ndb/test/ndbapi/testBasic.cpp
index 871179200c8..26622f9b066 100644
--- a/ndb/test/ndbapi/testBasic.cpp
+++ b/ndb/test/ndbapi/testBasic.cpp
@@ -264,7 +264,7 @@ static
 int
 readOneNoCommit(Ndb* pNdb, NdbConnection* pTrans, 
 		const NdbDictionary::Table* tab,NDBT_ResultRow * row){
-
+  int a;
   NdbOperation * pOp = pTrans->getNdbOperation(tab->getName());
   if (pOp == NULL){
     ERR(pTrans->getNdbError());
@@ -280,7 +280,7 @@ readOneNoCommit(Ndb* pNdb, NdbConnection* pTrans,
   }
   
   // Define primary keys
-  for(int a = 0; a<tab->getNoOfColumns(); a++){
+  for(a = 0; a<tab->getNoOfColumns(); a++){
     if (tab->getColumn(a)->getPrimaryKey() == true){
       if(tmp.equalForAttr(pOp, a, 0) != 0){
 	ERR(pTrans->getNdbError());
@@ -290,7 +290,7 @@ readOneNoCommit(Ndb* pNdb, NdbConnection* pTrans,
   }
   
   // Define attributes to read  
-  for(int a = 0; a<tab->getNoOfColumns(); a++){
+  for(a = 0; a<tab->getNoOfColumns(); a++){
     if((row->attributeStore(a) = 
 	pOp->getValue(tab->getColumn(a)->getName())) == 0) {
       ERR(pTrans->getNdbError());
@@ -639,35 +639,35 @@ int runNoCommitRollback630(NDBT_Context* ctx, NDBT_Step* step){
 
 
 int runNoCommitAndClose(NDBT_Context* ctx, NDBT_Step* step){
-  int result = NDBT_OK;
+  int i, result = NDBT_OK;
   HugoOperations hugoOps(*ctx->getTab());
   Ndb* pNdb = GETNDB(step);
 
   do{
     // Read 
     CHECK(hugoOps.startTransaction(pNdb) == 0);  
-    for (int i = 0; i < 10; i++)
+    for (i = 0; i < 10; i++)
       CHECK(hugoOps.pkReadRecord(pNdb, i, true) == 0);
     CHECK(hugoOps.execute_NoCommit(pNdb) == 0);
     CHECK(hugoOps.closeTransaction(pNdb) == 0);
   
     // Update
     CHECK(hugoOps.startTransaction(pNdb) == 0);  
-    for (int i = 0; i < 10; i++)
+    for (i = 0; i < 10; i++)
       CHECK(hugoOps.pkUpdateRecord(pNdb, i) == 0);
     CHECK(hugoOps.execute_NoCommit(pNdb) == 0);
     CHECK(hugoOps.closeTransaction(pNdb) == 0);
   
     // Delete
     CHECK(hugoOps.startTransaction(pNdb) == 0);  
-    for (int i = 0; i < 10; i++)
+    for (i = 0; i < 10; i++)
       CHECK(hugoOps.pkDeleteRecord(pNdb, i) == 0);
     CHECK(hugoOps.execute_NoCommit(pNdb) == 0);
     CHECK(hugoOps.closeTransaction(pNdb) == 0);
 
     // Try to insert, record should already exist
     CHECK(hugoOps.startTransaction(pNdb) == 0);  
-    for (int i = 0; i < 10; i++)
+    for (i = 0; i < 10; i++)
       CHECK(hugoOps.pkInsertRecord(pNdb, i) == 0);
     CHECK(hugoOps.execute_Commit(pNdb) == 630);
     CHECK(hugoOps.closeTransaction(pNdb) == 0);
@@ -781,14 +781,14 @@ int runCheckRollbackDeleteMultiple(NDBT_Context* ctx, NDBT_Step* step){
     CHECK(hugoOps.closeTransaction(pNdb) == 0);
     
     Uint32 updatesValue = 0;
-
+    Uint32 j;
     for(Uint32 i = 0; i<1; i++){
       // Read  record 5 - 10
       CHECK(hugoOps.startTransaction(pNdb) == 0);  
       CHECK(hugoOps.pkReadRecord(pNdb, 5, true, 10) == 0);
       CHECK(hugoOps.execute_NoCommit(pNdb) == 0);
       
-      for(Uint32 j = 0; j<10; j++){
+      for(j = 0; j<10; j++){
 	// Update  record 5 - 10
 	updatesValue++;
 	CHECK(hugoOps.pkUpdateRecord(pNdb, 5, 10, updatesValue) == 0);
@@ -799,7 +799,7 @@ int runCheckRollbackDeleteMultiple(NDBT_Context* ctx, NDBT_Step* step){
 	CHECK(hugoOps.verifyUpdatesValue(updatesValue) == 0);
       }      
       
-      for(Uint32 j = 0; j<10; j++){
+      for(j = 0; j<10; j++){
 	// Delete record 5 - 10 times
 	CHECK(hugoOps.pkDeleteRecord(pNdb, 5, 10) == 0);
 	CHECK(hugoOps.execute_NoCommit(pNdb) == 0);