Commit f9616d92 authored by unknown's avatar unknown

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
...@@ -611,16 +611,18 @@ void getTextTransporterError(QQQQ) { ...@@ -611,16 +611,18 @@ void getTextTransporterError(QQQQ) {
if(theData[2] == TransporterErrorString[i].errorNum) if(theData[2] == TransporterErrorString[i].errorNum)
{ {
BaseString::snprintf(m_text, m_text_len, 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[1],
theData[2],
TransporterErrorString[i].errorString); TransporterErrorString[i].errorString);
break; break;
} }
} }
if(i == lenth) if(i == lenth)
BaseString::snprintf(m_text, m_text_len, BaseString::snprintf(m_text, m_text_len,
"Transporter to node %d reported error: no such error", "Transporter to node %d reported error 0x%x: unknown error",
theData[1]); theData[1],
theData[2]);
} }
void getTextTransporterWarning(QQQQ) { void getTextTransporterWarning(QQQQ) {
getTextTransporterError(m_text, m_text_len, theData); getTextTransporterError(m_text, m_text_len, theData);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment