bk commit into 4.1 tree (jonas:1.2510) BUG#20683

[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.2510 06/06/26 12:16:39 jonas@stripped +2 -0
  ndb - bug#20683
    part 1 - make sure return code is propagated from request tracker

  ndb/src/kernel/vm/SafeCounter.hpp
    1.2 06/06/26 12:16:37 jonas@stripped +14 -8
    make sure object is not initialized in case of seize() failure, to make sure destructor doesnt assert

  ndb/src/kernel/vm/RequestTracker.hpp
    1.2 06/06/26 12:16:37 jonas@stripped +2 -2
    propagate return value

# 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.1/ndb/src/kernel/vm/RequestTracker.hpp	2004-04-14 10:24:22 +02:00
+++ 1.2/ndb/src/kernel/vm/RequestTracker.hpp	2006-06-26 12:16:37 +02:00
@@ -26,12 +26,12 @@ public:
   void init() { m_confs.clear(); m_nRefs = 0; }
 
   template<typename SignalClass>
-  void init(SafeCounterManager& mgr,
+  bool init(SafeCounterManager& mgr,
 	    NodeReceiverGroup rg, Uint16 GSN, Uint32 senderData)
   {
     init();
     SafeCounter tmp(mgr, m_sc);
-    tmp.init<SignalClass>(rg, GSN, senderData);
+    return tmp.init<SignalClass>(rg, GSN, senderData);
   }
 
   bool ignoreRef(SafeCounterManager& mgr, Uint32 nodeId)

--- 1.1/ndb/src/kernel/vm/SafeCounter.hpp	2004-04-14 10:24:23 +02:00
+++ 1.2/ndb/src/kernel/vm/SafeCounter.hpp	2006-06-26 12:16:37 +02:00
@@ -230,10 +230,13 @@ inline
 bool
 SafeCounter::init(NodeReceiverGroup rg, Uint16 GSN, Uint32 senderData){
   
-  bool b = init<Ref>(rg.m_block, GSN, senderData);
-  m_nodes = rg.m_nodes;
-  m_count = m_nodes.count();
-  return b;
+  if (init<Ref>(rg.m_block, GSN, senderData))
+  {
+    m_nodes = rg.m_nodes;
+    m_count = m_nodes.count();
+    return true;
+  }
+  return false;
 }
 
 template<typename Ref>
@@ -241,10 +244,13 @@ inline
 bool
 SafeCounter::init(NodeReceiverGroup rg, Uint32 senderData){
   
-  bool b = init<Ref>(rg.m_block, Ref::GSN, senderData);
-  m_nodes = rg.m_nodes;
-  m_count = m_nodes.count();
-  return b;
+  if (init<Ref>(rg.m_block, Ref::GSN, senderData))
+  {
+    m_nodes = rg.m_nodes;
+    m_count = m_nodes.count();
+    return true;
+  }
+  return false;
 }
 
 inline