Merge build.mysql.com:/users/tulin/mysql-5.0-ndb

into build.mysql.com:/users/tulin/wl2299


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

ndb/src/common/util/Bitmask.cpp

@@ -5,7 +5,7 @@ static
 void print(const Uint32 src[], Uint32 len, Uint32 pos = 0)
 {
   printf("b'");
-  for(int i = 0; i<len; i++)
+  for(unsigned i = 0; i<len; i++)
   {
     if(BitmaskImpl::get((pos + len + 31) >> 5, src, i+pos))
       printf("1");

ndb/src/kernel/blocks/dbdict/Dbdict.cpp

@@ -4350,7 +4350,7 @@ Dbdict::execTAB_COMMITCONF(Signal* signal){
       }
       tAttr = aRec->nextAttrInTable;
     }
-    ndbrequire(sz == 2 * tabPtr.p->noOfPrimkey);
+    ndbrequire((int)sz == 2 * tabPtr.p->noOfPrimkey);
 
     LinearSectionPtr lsPtr[3];
     lsPtr[0].p = buf;

ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp

@@ -262,7 +262,7 @@ Dbtux::readKeyAttrs(const Frag& frag, TreeEnt ent, unsigned start, Data keyData)
       debugOut << endl;
       totalSize += 1 + dataSize;
     }
-    ndbassert(totalSize == ret);
+    ndbassert((int)totalSize == ret);
   }
 #endif
 }

ndb/src/mgmapi/mgmapi.cpp

@@ -314,8 +314,8 @@ ndb_mgm_call(NdbMgmHandle handle, const ParserRow<ParserDummy> *command_reply,
      */
     ndbout << "Error in mgm protocol parser. "
 	   << "cmd: '" << cmd
-	   << "' status=" << ctx.m_status
-	   << ", curr=" << ctx.m_currentToken
+	   << "' status=" << (Uint32)ctx.m_status
+	   << ", curr=" << (Uint32)ctx.m_currentToken
 	   << endl;
     DBUG_PRINT("info",("parser.parse returned NULL"));
   } 

ndb/src/mgmsrv/MgmtSrvr.cpp

@@ -2809,7 +2809,7 @@ MgmtSrvr::setConnectionDbParameter(int node1,
   ConfigValues::Iterator i2(_config->m_configValues->m_config, 
 			    iter.m_config);
 
-  if(i2.set(param, (unsigned)value) < 0) {
+  if(i2.set(param, (unsigned)value) == false) {
     msg.assign("Unable to set new value of parameter");
     return -1;
   }

ndb/src/ndbapi/Ndb.cpp

@@ -47,7 +47,7 @@ NdbTransaction* Ndb::doConnect(Uint32 tConNode)
 {
   Uint32        tNode;
   Uint32        tAnyAlive = 0;
-  int TretCode;
+  int TretCode= 0;
 
   if (tConNode != 0) {
     TretCode = NDB_connect(tConNode);
@@ -892,7 +892,7 @@ Ndb::opTupleIdOnNdb(Uint32 aTableId, Uint64 opValue, Uint32 op)
   DBUG_PRINT("enter", ("table=%u value=%llu op=%u", aTableId, opValue, op));
 
   NdbTransaction*     tConnection;
-  NdbOperation*      tOperation;
+  NdbOperation*      tOperation= 0; // Compiler warning if not initialized
   Uint64             tValue;
   NdbRecAttr*        tRecAttrResult;
   int                result;

ndb/src/ndbapi/NdbDictionaryImpl.cpp

@@ -1370,9 +1370,7 @@ NdbDictInterface::parseTableInfo(NdbTableImpl ** ret,
     }
 
     Uint32 topBit = (1 << 31);
-    for(i = 31; i>=0; i--){
-      if((fragCount & topBit) != 0)
-	  break;
+    for(; topBit && !(fragCount & topBit); ){
       topBit >>= 1;
     }
     impl->m_hashValueMask = topBit - 1;

ndb/src/ndbapi/TransporterFacade.cpp

@@ -473,12 +473,12 @@ void TransporterFacade::threadMainReceive(void)
 }
 
 TransporterFacade::TransporterFacade(NdbMgmHandle mgm_handle) :
+  m_mgm_handle(mgm_handle),
   theTransporterRegistry(0),
   theStopReceive(0),
   theSendThread(NULL),
   theReceiveThread(NULL),
-  m_fragmented_signal_id(0),
-  m_mgm_handle(mgm_handle)
+  m_fragmented_signal_id(0)
 {
   theOwnId = 0;
 

ndb/src/ndbapi/ndb_cluster_connection.cpp

@@ -497,7 +497,9 @@ int Ndb_cluster_connection::connect(int no_retries, int retry_delay_in_seconds,
     m_impl.m_transporter_facade->start_instance(nodeId, props);
     m_impl.init_nodes_vector(nodeId, *props);
 
-    for(int i=0;i<m_impl.m_transporter_facade->get_registry()->m_transporter_interface.size();i++)
+    for(unsigned i=0;
+	i<m_impl.m_transporter_facade->get_registry()->m_transporter_interface.size();
+	i++)
       ndb_mgm_set_connection_int_parameter(m_impl.m_config_retriever->get_mgmHandle(),
 					   nodeId,
 					   m_impl.m_transporter_facade->get_registry()