Merge mysql.com:/home/bk/mysql-4.1

into mysql.com:/build/mysqldev/my/mysql-4.1-tomastest


ndb/tools/waiter.cpp:
  Auto merged

7 files changed, 18 insertions, 15 deletions

diff --git a/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp b/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp
index 0f4b0862960..7057d74c3ad 100644
--- a/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp
+++ b/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp
@@ -104,7 +104,7 @@ Dbtux::searchToAdd(Frag& frag, ConstData searchKey, TreeEnt searchEnt, TreePos&
   treePos.m_loc = currNode.m_loc;
   // binary search
   int lo = -1;
-  int hi = currNode.getOccup();
+  unsigned hi = currNode.getOccup();
   int ret;
   while (1) {
     jam();
diff --git a/ndb/src/kernel/blocks/dbutil/DbUtil.cpp b/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
index 554fc693fb8..f5379689a5f 100644
--- a/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
+++ b/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
@@ -1059,6 +1059,7 @@ DbUtil::prepareOperation(Signal* signal, PreparePtr prepPtr)
       ndbrequire(prepPagesReader.getValueLen() <= MAX_ATTR_NAME_SIZE);
       
       prepPagesReader.getString(attrNameRequested);
+      attrIdRequested= ~0u;
     } else {
       jam();
       attrIdRequested = prepPagesReader.getUint32();
diff --git a/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp b/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
index 97f8c8cda1b..43044eeebcd 100644
--- a/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
+++ b/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
@@ -37,9 +37,9 @@ void Ndbcntr::initRecords()
 
 Ndbcntr::Ndbcntr(const class Configuration & conf):
   SimulatedBlock(NDBCNTR, conf),
-  c_stopRec(* this),
   cnoWaitrep6(0),
   cnoWaitrep7(0),
+  c_stopRec(* this),
   c_missra(* this)
 {
 
diff --git a/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp b/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
index 9c0c6e141e1..41deb3403c8 100644
--- a/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
+++ b/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
@@ -1760,8 +1760,8 @@ void Qmgr::execAPI_FAILCONF(Signal* signal)
   } else {
     jam();
 #ifdef VM_TRACE
-    ndbout << "failedNodePtr.p->failState = " << failedNodePtr.p->failState
-	   << endl;
+    ndbout << "failedNodePtr.p->failState = "
+	   << (Uint32)(failedNodePtr.p->failState) << endl;
 #endif   
     systemErrorLab(signal);
   }//if
@@ -1932,10 +1932,6 @@ void Qmgr::execAPI_REGREQ(Signal* signal)
 
   bool compatability_check;
   switch(getNodeInfo(apiNodePtr.i).getType()){
-  case NodeInfo::DB:
-  case NodeInfo::INVALID:
-    sendApiRegRef(signal, ref, ApiRegRef::WrongType);
-    return;
   case NodeInfo::API:
     compatability_check = ndbCompatible_ndb_api(NDB_VERSION, version);
     break;
@@ -1945,6 +1941,11 @@ void Qmgr::execAPI_REGREQ(Signal* signal)
   case NodeInfo::REP:
     compatability_check = ndbCompatible_ndb_api(NDB_VERSION, version);
     break;
+  case NodeInfo::DB:
+  case NodeInfo::INVALID:
+  default:
+    sendApiRegRef(signal, ref, ApiRegRef::WrongType);
+    return;
   }
 
   if (!compatability_check) {
diff --git a/ndb/src/kernel/blocks/suma/Suma.cpp b/ndb/src/kernel/blocks/suma/Suma.cpp
index 8e651343ab7..d11d5f7176a 100644
--- a/ndb/src/kernel/blocks/suma/Suma.cpp
+++ b/ndb/src/kernel/blocks/suma/Suma.cpp
@@ -98,7 +98,7 @@ Suma::getNodeGroupMembers(Signal* signal) {
   }
 
   //  ndbout_c("c_noNodesInGroup=%d", c_noNodesInGroup);
-  ndbrequire(c_noNodesInGroup >= 0); // at least 1 node in the nodegroup
+  ndbrequire(c_noNodesInGroup > 0); // at least 1 node in the nodegroup
 
 #ifdef NODEFAIL_DEBUG
   for (Uint32 i = 0; i < c_noNodesInGroup; i++) {
@@ -2713,6 +2713,7 @@ Suma::getResponsibleSumaNodeId(Uint32 D)
     id = RNIL;
   } else {
     jam();
+    id = RNIL;
     const Uint32 n = c_noNodesInGroup; // Number nodes in node group
     const Uint32 C1 = D / n;
     const Uint32 C2 = D - C1*n; // = D % n;
diff --git a/ndb/test/src/NDBT_Table.cpp b/ndb/test/src/NDBT_Table.cpp
index d283cdf5912..8d398b75d81 100644
--- a/ndb/test/src/NDBT_Table.cpp
+++ b/ndb/test/src/NDBT_Table.cpp
@@ -24,7 +24,7 @@ operator <<(class NdbOut& ndbout, const NDBT_Table & tab)
   ndbout << "-- " << tab.getName() << " --" << endl;
   
   ndbout << "Version: " <<  tab.getObjectVersion() << endl; 
-  ndbout << "Fragment type: " <<  tab.getFragmentType() << endl; 
+  ndbout << "Fragment type: " <<  (unsigned) tab.getFragmentType() << endl; 
   ndbout << "K Value: " <<  tab.getKValue()<< endl; 
   ndbout << "Min load factor: " <<  tab.getMinLoadFactor()<< endl;
   ndbout << "Max load factor: " <<  tab.getMaxLoadFactor()<< endl; 
@@ -47,7 +47,7 @@ operator <<(class NdbOut& ndbout, const NDBT_Table & tab)
     ndbout << "Retrieved" << endl;
     break;
   default:
-    ndbout << "Unknown(" << tab.getObjectStatus() << ")" << endl;
+    ndbout << "Unknown(" << (unsigned) tab.getObjectStatus() << ")" << endl;
   }
   
   ndbout << "-- Attributes -- " << endl;
@@ -81,7 +81,7 @@ class NdbOut& operator <<(class NdbOut&, const NdbDictionary::Index & idx)
     ndbout << "OrderedIndex";
     break;
   default:
-    ndbout << "Type " << idx.getType();
+    ndbout << "Type " << (unsigned) idx.getType();
     break;
   }
   return ndbout;
diff --git a/ndb/tools/waiter.cpp b/ndb/tools/waiter.cpp
index 6dcea6ccc48..c01a3f9192e 100644
--- a/ndb/tools/waiter.cpp
+++ b/ndb/tools/waiter.cpp
@@ -68,7 +68,7 @@ int main(int argc, const char** argv){
       return NDBT_ProgramExit(NDBT_FAILED);
     }
 
-    for (int i = 0; i<lcfg.ids.size();i++)
+    for (unsigned i = 0; i<lcfg.ids.size();i++)
     {
       MgmtSrvrId * m = &lcfg.ids[i];
       
@@ -292,8 +292,8 @@ waitClusterStatus(const char* _addr,
 	  if (ndbNode->node_status < _status)
 	    allInState = false;
 	  else 
-	    g_info << "node_status(" << ndbNode->node_status
-		   <<") != _status("<<_status<<")"<<endl;
+	    g_info << "node_status(" << (unsigned)ndbNode->node_status
+		   << ") != _status("<< (unsigned)_status << ")" <<endl;
 	} else if (ndbNode->start_phase < _startphase)
 	  allInState = false;
       } else {