bk commit into 4.1 tree (jonas:1.2484) BUG#16447

[jonas]

Below is the list of changes that have just been committed into a local
4.1 repository of jonas. When jonas 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.2484 06/03/31 11:39:35 jonas@stripped +2 -0
  ndb - bug#16447
    correct return value in check_cm_cmregreq

  ndb/test/src/NdbRestarts.cpp
    1.6 06/03/31 11:39:34 jonas@stripped +1 -2
    Fix bug in test program

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.18 06/03/31 11:39:34 jonas@stripped +8 -2
    Fix bug in bug#16447

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/41-work

--- 1.17/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2006-03-30 14:20:52 +02:00
+++ 1.18/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2006-03-31 11:39:34 +02:00
@@ -848,10 +848,12 @@
     goto die_direct;
   }
   
-  return false;
+  return true;
 
 die_direct:
   ndbout_c(buf);
+  CRASH_INSERTION(932);
+  
   progError(__LINE__, 
 	    ERR_ARBIT_SHUTDOWN, 
 	    buf);
@@ -2082,9 +2084,13 @@
   case ZFAIL_CLOSING:
   case ZAPI_ACTIVE:
   case ZAPI_INACTIVE:
+  {
+    char buf[100];
+    BaseString::snprintf(buf, 100, "Node %u disconected", nodeId);    
+    progError(__LINE__, ERR_SR_OTHERNODEFAILED, buf);
     ndbrequire(false);
   }
-
+  }
   node_failed(signal, nodeId);
 }//DISCONNECT_REP
 

--- 1.5/ndb/test/src/NdbRestarts.cpp	2006-03-27 10:18:46 +02:00
+++ 1.6/ndb/test/src/NdbRestarts.cpp	2006-03-31 11:39:34 +02:00
@@ -445,8 +445,7 @@
 	 << ") secs " << endl;
   NdbSleep_SecSleep(seconds);
 
-  randomId = (rand() % _restarter.getNumDbNodes());
-  nodeId = _restarter.getDbNodeId(randomId);  
+  nodeId = _restarter.getRandomNodeOtherNodeGroup(nodeId, rand());
   g_info << _restart->m_name << ": node = "<< nodeId << endl;
 
   CHECK(_restarter.insertErrorInNode(nodeId, 9999) == 0,