Commit 5fc83a47 authored by unknown's avatar unknown
Browse files

Merge mskold@build.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
parents f0e23df6 5d2fc669

ndb/include/mgmcommon/ConfigRetriever.hpp

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ private: 
  

  BaseString            _localConfigFileName;

  struct LocalConfig    _localConfig;

  int                   _ownNodeId;

  Uint32                _ownNodeId;

  

  BaseString            m_connectString;

ndb/src/common/debugger/signaldata/ScanTab.cpp

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ printSCANTABCONF(FILE * output, const Uint32 * theData, Uint32 len, Uint16 recei 
    fprintf(output, " Operation(s) [api tc rows len]:\n");

    ScanTabConf::OpData * op = (ScanTabConf::OpData*)

      (theData + ScanTabConf::SignalLength);

    for(int i = 0; i<op_count; i++){

    for(size_t i = 0; i<op_count; i++){

      if(op->info != ScanTabConf::EndOfData)

	fprintf(output, " [0x%x 0x%x %d %d]",

		op->apiPtrI, op->tcPtrI,

ndb/src/common/mgmcommon/ConfigRetriever.cpp

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ ConfigRetriever::do_connect(int exit_on_connect_failure){ 
  while(retry < retry_max){

    Uint32 type = CR_ERROR;

    BaseString tmp;

    for (int i = 0; i<_localConfig.ids.size(); i++){

    for (unsigned int i = 0; i<_localConfig.ids.size(); i++){

      MgmtSrvrId * m = &_localConfig.ids[i];

      switch(m->type){

      case MgmId_TCP:
@@ -139,7 +139,7 @@ ConfigRetriever::getConfig() { 
  if(m_handle != 0){

    p = getConfig(m_handle);

  } else {

    for (int i = 0; i<_localConfig.ids.size(); i++){

    for (unsigned int i = 0; i<_localConfig.ids.size(); i++){

      MgmtSrvrId * m = &_localConfig.ids[i];

      switch(m->type){

      case MgmId_File:

ndb/src/common/mgmcommon/LocalConfig.cpp

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ bool LocalConfig::readFile(const char * filename, bool &fopenError) 
    return false;

  }



  int sz = 1024;

  unsigned int sz = 1024;

  char* theString = (char*)NdbMem_Allocate(sz);

  theString[0] = 0;

ndb/src/ndbapi/Ndb.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1141,7 +1141,7 @@ void Ndb::setCatalogName(const char * a_catalog_name) 
    int len = snprintf(prefixName, sizeof(prefixName), "%s%c%s%c",

                       theDataBase, table_name_separator,

                       theDataBaseSchema, table_name_separator);

    prefixEnd = prefixName + (len < sizeof(prefixName) ? len : 

    prefixEnd = prefixName + (len < (int) sizeof(prefixName) ? len : 

                              sizeof(prefixName) - 1);

  }

}
@@ -1160,7 +1160,7 @@ void Ndb::setSchemaName(const char * a_schema_name) 
    int len = snprintf(prefixName, sizeof(prefixName), "%s%c%s%c",

                       theDataBase, table_name_separator,

                       theDataBaseSchema, table_name_separator);

    prefixEnd = prefixName + (len < sizeof(prefixName) ? len : 

    prefixEnd = prefixName + (len < (int) sizeof(prefixName) ? len : 

                              sizeof(prefixName) - 1);

  }

}