bk commit into 5.1 tree (tomas:1.2426) BUG#25743

[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.2426 07/03/09 10:21:11 tomas@stripped +1 -0
  BUG#25743 If undo_buffer_size (for LG) greater than the inital shared memory (default
20M), ndbd nodes are crashed

  storage/ndb/src/kernel/vm/Pool.hpp
    1.12 07/03/09 10:21:00 tomas@stripped +5 -2
    Only when m_pool.seize() return true, the ptr.i and ptr.p is assigned the ri
    ght value, or else the parameter ptr should be "not touched"

# 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.11/storage/ndb/src/kernel/vm/Pool.hpp	2006-12-24 02:33:30 +07:00
+++ 1.12/storage/ndb/src/kernel/vm/Pool.hpp	2007-03-09 10:21:00 +07:00
@@ -307,8 +307,11 @@ RecordPool<T, P>::seize(Ptr<T> & ptr)
 {
   Ptr<void> tmp;
   bool ret = m_pool.seize(tmp);
-  ptr.i = tmp.i;
-  ptr.p = static_cast<T*>(tmp.p);
+  if(likely(ret))
+  {
+    ptr.i = tmp.i;
+    ptr.p = static_cast<T*>(tmp.p);
+  }
   return ret;
 }