Commit 75c20729 authored by unknown's avatar unknown
Browse files

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

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


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
parents 31796706 f184c817

sql/ha_ndbcluster.cc

+7 −0
Original line number Diff line number Diff line
@@ -6156,9 +6156,16 @@ int ndbcluster_discover(handlerton *hton, THD* thd, const char *db, 
    {

      const NdbError err= dict->getNdbError();

      if (err.code == 709 || err.code == 723)

      {

        error= -1;

        DBUG_PRINT("info", ("ndb_error.code: %u", ndb_error.code));

      }

      else

      {

        error= -1;

        ndb_error= err;

        DBUG_PRINT("info", ("ndb_error.code: %u", ndb_error.code));

      }

      goto err;

    }

    DBUG_PRINT("info", ("Found table %s", tab->getName()));

storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp

+2 −0
Original line number Diff line number Diff line
@@ -1753,6 +1753,7 @@ NdbDictInterface::dictSignal(NdbApiSignal* sig, 
	       m_transporter->sendSignal(sig, node));

    if(res != 0){

      DBUG_PRINT("info", ("dictSignal failed to send signal"));

      m_error.code = 4007;

      continue;

    }
@@ -1770,6 +1771,7 @@ NdbDictInterface::dictSignal(NdbApiSignal* sig, 
     */

    if(ret_val == -2) //WAIT_NODE_FAILURE

    {

      m_error.code = 4013;

      continue;

    }

    if(m_waiter.m_state == WST_WAIT_TIMEOUT)

storage/ndb/src/ndbapi/ndberror.c

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

   * Unknown result

   */

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

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

  { 4009, DMEC, UR, "Cluster Failure" },

  { 4012, DMEC, UR, 

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

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

  { 4024, DMEC, UR, 

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