From: Date: March 1 2006 11:30am
Subject: bk commit into 5.1 tree (jonas:1.2214)
List-Archive: http://lists.mysql.com/commits/3305
Message-Id: <20060301103037.A06FA2E825D@perch.ndb.mysql.com>

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
  1.2214 06/03/01 11:30:32 jonas@stripped +2 -0
  merge fix

  storage/ndb/src/kernel/blocks/pgman.cpp
    1.12 06/03/01 11:30:29 jonas@stripped +2 -2
    merge

  storage/ndb/src/kernel/SimBlockList.cpp
    1.15 06/03/01 11:30:29 jonas@stripped +1 -1
    merge

# 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/51-ndb

--- 1.11/storage/ndb/src/kernel/blocks/pgman.cpp	2006-02-25 22:12:10 +01:00
+++ 1.12/storage/ndb/src/kernel/blocks/pgman.cpp	2006-03-01 11:30:29 +01:00
@@ -2172,8 +2172,8 @@
   out << " busy_count=" << dec << pe.m_busy_count;
 #ifdef VM_TRACE
   {
-    Local_page_request_list req_list(ptr.p->m_this->m_page_request_pool, 
-				     ptr.p->m_requests);
+    Pgman::Local_page_request_list 
+      req_list(ptr.p->m_this->m_page_request_pool, ptr.p->m_requests);
     if (! req_list.isEmpty())
     {
       Ptr<Pgman::Page_request> req_ptr;

--- 1.14/storage/ndb/src/kernel/SimBlockList.cpp	2006-03-01 10:20:38 +01:00
+++ 1.15/storage/ndb/src/kernel/SimBlockList.cpp	2006-03-01 11:30:29 +01:00
@@ -79,7 +79,7 @@
   Lgman* lg = 0;
   Tsman* ts = 0;
 
-  Block_context ctx(conf, *data.m_mem_manager);
+  Block_context ctx(*data.theConfiguration, *data.m_mem_manager);
   
   SimulatedBlock * fs = 0;
   {