bk commit into 5.1 tree (jonas:1.2865)

[jonas]

Below is the list of changes that have just been committed into a local
5.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@stripped, 2008-02-08 19:25:21+01:00, jonas@stripped +1 -0
  merge error

  storage/ndb/src/kernel/vm/mt.cpp@stripped, 2008-02-08 19:25:19+01:00, jonas@stripped +3 -1
    merge error

diff -Nrup a/storage/ndb/src/kernel/vm/mt.cpp b/storage/ndb/src/kernel/vm/mt.cpp
--- a/storage/ndb/src/kernel/vm/mt.cpp	2008-01-01 13:45:07 +01:00
+++ b/storage/ndb/src/kernel/vm/mt.cpp	2008-02-08 19:25:19 +01:00
@@ -526,7 +526,9 @@ struct thr_safe_pool
     {
       Uint32 dummy;
       unlock(&m_lock);
-      ret = reinterpret_cast<T*>(m_mm->alloc_page(RT_JOB_BUFFER, &dummy));
+      ret = reinterpret_cast<T*>
+        (m_mm->alloc_page(RT_JOB_BUFFER, &dummy, 
+                          Ndbd_mem_manager::NDB_ZONE_ANY));
       // ToDo: How to deal with failed allocation?!?
       // I think in this case we need to start grabbing buffers kept for signal
       // trace.