Commit 2b165500 authored by unknown's avatar unknown
Browse files

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

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


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
parents 117e6b60 6ed3ff49

ndb/src/common/util/Bitmask.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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;

  }