Commit f9616d92 authored by unknown's avatar unknown
Browse files

Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb 

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  manual merge
storage/ndb/src/common/debugger/EventLogger.cpp:
  masnual merge
parents 6757caaa a3dc06a8

storage/ndb/src/common/debugger/EventLogger.cpp

+5 −3
Original line number Diff line number Diff line
@@ -611,16 +611,18 @@ void getTextTransporterError(QQQQ) { 
    if(theData[2] == TransporterErrorString[i].errorNum)

    {

      BaseString::snprintf(m_text, m_text_len,

                          "Transporter to node %d reported error: %s",

                          "Transporter to node %d reported error 0x%x: %s",

                          theData[1],

			  theData[2],

                          TransporterErrorString[i].errorString);

      break;

    }

  }

  if(i == lenth)

    BaseString::snprintf(m_text, m_text_len,   

                        "Transporter to node %d reported error: no such error",

                          theData[1]);

                        "Transporter to node %d reported error 0x%x: unknown error",

                          theData[1],

			  theData[2]);

}

void getTextTransporterWarning(QQQQ) {

  getTextTransporterError(m_text, m_text_len, theData);