Commit 07fa209b authored by unknown's avatar unknown
Browse files

Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca 

into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
parents 09ea47d4 7c143080

ndb/src/ndbapi/NdbDictionaryImpl.cpp

+4 −0
Original line number Diff line number Diff line
@@ -880,6 +880,7 @@ NdbDictInterface::dictSignal(NdbApiSignal* signal, 
	r = m_transporter->sendSignal(signal, aNodeId);

      }

      if(r != 0){

        m_error.code= 4007;

	m_transporter->unlock_mutex();

	continue;

      }
@@ -903,7 +904,10 @@ NdbDictInterface::dictSignal(NdbApiSignal* signal, 
     * Handle error codes

     */

    if(m_waiter.m_state == WAIT_NODE_FAILURE)

    {

      m_error.code = 4013;

      continue;

    }



    if(m_waiter.m_state == WST_WAIT_TIMEOUT)

    {

ndb/src/ndbapi/ndberror.c

+2 −0
Original line number Diff line number Diff line
@@ -137,10 +137,12 @@ ErrorBundle ErrorCodes[] = { 
  /**

   * Unknown result

   */

  { 4007, UR, "Send to ndbd node failed" },

  { 4008, UR, "Receive from NDB failed" },

  { 4009, UR, "Cluster Failure" },

  { 4012, UR, 

    "Request ndbd time-out, maybe due to high load or communication problems"}, 

  { 4013, UR, "Request timed out in waiting for node failure"}, 

  { 4024, UR, 

    "Time-out, most likely caused by simple read or cluster failure" },