bk commit into 5.0 tree (tomas:1.2398)

[tomas]

Below is the list of changes that have just been committed into a local
5.0 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2398 07/03/09 20:34:00 tomas@stripped +2 -0
  added error code for failing send signal and timeout waiting for node failure
  added error code for failing send signal and timeout waiting for node failure

  ndb/src/ndbapi/ndberror.c
    1.56 07/03/09 20:33:54 tomas@stripped +2 -0
    added error code for failing send signal and timeout waiting for node failure

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.97 07/03/09 20:33:54 tomas@stripped +4 -0
    added error code for failing send signal and timeout waiting for node failure

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.mysql.com
# Root:	/home/tomas/mysql-5.0-telco-gca

--- 1.96/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-12-24 02:04:18 +07:00
+++ 1.97/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2007-03-09 20:33:54 +07:00
@@ -880,6 +880,7 @@ NdbDictInterface::dictSignal(NdbApiSigna
 	r = m_transporter->sendSignal(signal, aNodeId);
       }
       if(r != 0){
+        m_error.code= 4007;
 	m_transporter->unlock_mutex();
 	continue;
       }
@@ -903,7 +904,10 @@ NdbDictInterface::dictSignal(NdbApiSigna
      * Handle error codes
      */
     if(m_waiter.m_state == WAIT_NODE_FAILURE)
+    {
+      m_error.code = 4013;
       continue;
+    }
 
     if(m_waiter.m_state == WST_WAIT_TIMEOUT)
     {

--- 1.55/ndb/src/ndbapi/ndberror.c	2007-03-02 09:05:59 +07:00
+++ 1.56/ndb/src/ndbapi/ndberror.c	2007-03-09 20:33:54 +07:00
@@ -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" },