Commit b3890381 authored by unknown's avatar unknown
Browse files

Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj 

into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21052
parents 32a0f4e5 e997b362

ndb/include/ndbapi/ndberror.h

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ typedef ndberror_classification_enum ndberror_classification; 
const char *ndberror_status_message(ndberror_status);

const char *ndberror_classification_message(ndberror_classification);

void ndberror_update(ndberror_struct *);

int ndb_error_string(int err_no, char *str, unsigned int size);

int ndb_error_string(int err_no, char *str, int size);



#endif /* doxygen skip internal*/

ndb/src/mgmsrv/Services.cpp

+6 −3
Original line number Diff line number Diff line
@@ -1337,7 +1337,7 @@ Ndb_mgmd_event_service::log(int eventType, const Uint32* theData, NodeId nodeId) 
  if (EventLoggerBase::event_lookup(eventType,cat,threshold,severity,textF))

    DBUG_VOID_RETURN;



  char m_text[256];

  char m_text[512];

  EventLogger::getText(m_text, sizeof(m_text),

		       textF, theData, nodeId);
@@ -1356,8 +1356,11 @@ Ndb_mgmd_event_service::log(int eventType, const Uint32* theData, NodeId nodeId) 
    if(strcmp(ndb_logevent_body[i].token,"error") == 0)

    {

      int m_text_len= strlen(m_text);

      snprintf(m_text+m_text_len, 4 , " - ");

      ndb_error_string(theData[3], m_text+(m_text_len+3), sizeof(m_text)-m_text_len-3);

      if(sizeof(m_text)-m_text_len-3 > 0)

      {

        BaseString::snprintf(m_text+m_text_len, 4 , " - ");

        ndb_error_string(val, m_text+(m_text_len+3), sizeof(m_text)-m_text_len-3);

      }

    }

  }

ndb/src/ndbapi/ndberror.c

+5 −2
Original line number Diff line number Diff line
@@ -680,11 +680,14 @@ const char *ndberror_classification_message(ndberror_classification classificati 
  return empty_string;

}



int ndb_error_string(int err_no, char *str, unsigned int size)

int ndb_error_string(int err_no, char *str, int size)

{

  ndberror_struct error;

  unsigned int len;

  int len;



  assert(size > 1);

  if(size <= 1) 

    return 0;

  error.code = err_no;

  ndberror_update(&error);