bk commit into 5.1 tree (tomas:1.2428) BUG#26825

[tomas]

Below is the list of changes that have just been committed into a local
5.1 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.2428 07/03/09 20:29:46 tomas@stripped +3 -0
  Bug #26825  	MySQL Server Crashes in high load
  Bug #26997  	mysqld segfault when in single user mode

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

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.158 07/03/09 20:29:37 tomas@stripped +2 -0
    add error code for failing send signal (typically single user mode)

  sql/ha_ndbcluster.cc
    1.399 07/03/09 20:29:37 tomas@stripped +7 -0
    make sure error is always set even if no proper error code from ndb

# 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.1-telco-gca

--- 1.157/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-12-27 16:58:06 +07:00
+++ 1.158/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2007-03-09 20:29:37 +07:00
@@ -1753,6 +1753,7 @@ NdbDictInterface::dictSignal(NdbApiSigna
 	       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(NdbApiSigna
      */
     if(ret_val == -2) //WAIT_NODE_FAILURE
     {
+      m_error.code = 4013;
       continue;
     }
     if(m_waiter.m_state == WST_WAIT_TIMEOUT)

--- 1.398/sql/ha_ndbcluster.cc	2007-02-26 23:46:05 +07:00
+++ 1.399/sql/ha_ndbcluster.cc	2007-03-09 20:29:37 +07:00
@@ -6093,9 +6093,16 @@ int ndbcluster_discover(handlerton *hton
     {
       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()));

--- 1.83/storage/ndb/src/ndbapi/ndberror.c	2007-03-02 09:12:54 +07:00
+++ 1.84/storage/ndb/src/ndbapi/ndberror.c	2007-03-09 20:29:38 +07:00
@@ -149,10 +149,12 @@ ErrorBundle ErrorCodes[] = {
   /**
    * Unknown result
    */
+  { 4007, DMEC, UR, "Send to ndbd 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 faiulure"}, 
   { 4024, DMEC, UR, 
     "Time-out, most likely caused by simple read or cluster failure" },