bk commit into 5.1 tree (pekka:1.2665) BUG#34046

[pekka]

Below is the list of changes that have just been committed into a local
5.1 repository of pekka.  When pekka 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-01-28 14:48:09+01:00, pekka@stripped +3 -0
  ndb - bug#34046 - rename Ndbd_mem_manager::log2 to ndb_log2

  storage/ndb/src/kernel/vm/NdbdSuperPool.cpp@stripped, 2008-01-28 14:46:11+01:00,
pekka@stripped +1 -1
    rename Ndbd_mem_manager::log2 to ndb_log2

  storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp@stripped, 2008-01-28 14:46:11+01:00,
pekka@stripped +4 -4
    rename Ndbd_mem_manager::log2 to ndb_log2

  storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp@stripped, 2008-01-28 14:46:11+01:00,
pekka@stripped +1 -1
    rename Ndbd_mem_manager::log2 to ndb_log2

diff -Nrup a/storage/ndb/src/kernel/vm/NdbdSuperPool.cpp
b/storage/ndb/src/kernel/vm/NdbdSuperPool.cpp
--- a/storage/ndb/src/kernel/vm/NdbdSuperPool.cpp	2006-12-23 20:33:30 +01:00
+++ b/storage/ndb/src/kernel/vm/NdbdSuperPool.cpp	2008-01-28 14:46:11 +01:00
@@ -48,7 +48,7 @@ NdbdSuperPool::NdbdSuperPool(class Ndbd_
 {
   m_memRoot = m_mm.get_memroot();
   
-  m_shift = Ndbd_mem_manager::log2((1 << (BMW_2LOG + 2)) / pageSize) - 1;
+  m_shift = Ndbd_mem_manager::ndb_log2((1 << (BMW_2LOG + 2)) / pageSize) - 1;
   m_add = (1 << m_shift) - 1;
 }
 
diff -Nrup a/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp
b/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp
--- a/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp	2007-02-23 12:13:51 +01:00
+++ b/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp	2008-01-28 14:46:11 +01:00
@@ -125,7 +125,7 @@ do_malloc(Uint32 pages, InitChunk* chunk
 }
 
 Uint32
-Ndbd_mem_manager::log2(Uint32 input)
+Ndbd_mem_manager::ndb_log2(Uint32 input)
 {
   input = input | (input >> 8);
   input = input | (input >> 4);
@@ -400,7 +400,7 @@ Ndbd_mem_manager::alloc(Uint32* ret, Uin
   Int32 i;
   Uint32 start;
   Uint32 cnt = * pages;
-  Uint32 list = log2(cnt - 1);
+  Uint32 list = ndb_log2(cnt - 1);
   
   assert(cnt);
   assert(list <= 16);
@@ -438,7 +438,7 @@ Ndbd_mem_manager::alloc(Uint32* ret, Uin
    *   search in other lists...
    */
 
-  Int32 min_list = log2(min - 1);
+  Int32 min_list = ndb_log2(min - 1);
   assert((Int32)list >= min_list);
   for (i = list - 1; i >= min_list; i--) 
   {
@@ -470,7 +470,7 @@ Ndbd_mem_manager::alloc(Uint32* ret, Uin
 void
 Ndbd_mem_manager::insert_free_list(Uint32 start, Uint32 size)
 {
-  Uint32 list = log2(size) - 1;
+  Uint32 list = ndb_log2(size) - 1;
   Uint32 last = start + size - 1;
 
   Uint32 head = m_buddy_lists[list];
diff -Nrup a/storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp
b/storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp
--- a/storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp	2006-12-23 20:33:30 +01:00
+++ b/storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp	2008-01-28 14:46:11 +01:00
@@ -75,7 +75,7 @@ public:
    * @note size = 0     -> 0
    * @note size > 65536 -> 16
    */
-  static Uint32 log2(Uint32 size);
+  static Uint32 ndb_log2(Uint32 size);
 
 private:
   void grow(Uint32 start, Uint32 cnt);