bk commit into 5.1 tree (jonas:1.2114)

[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
  1.2114 06/02/16 13:12:25 jonas@stripped +2 -0
  Fix for solaris compiler

  storage/ndb/src/kernel/vm/SimulatedBlock.hpp
    1.21 06/02/16 13:12:22 jonas@stripped +2 -0
    Fix for solaris compiler

  storage/ndb/src/kernel/SimBlockList.cpp
    1.13 06/02/16 13:12:22 jonas@stripped +1 -2
    Fix for solaris compiler

# 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/mysql-5.1-new

--- 1.12/storage/ndb/src/kernel/SimBlockList.cpp	2006-02-13 13:12:41 +01:00
+++ 1.13/storage/ndb/src/kernel/SimBlockList.cpp	2006-02-16 13:12:22 +01:00
@@ -78,8 +78,7 @@
   Lgman* lg = 0;
   Tsman* ts = 0;
 
-  Block_context ctx = 
-    { conf, * (Ndbd_mem_manager*)0 };
+  Block_context ctx(conf, * (Ndbd_mem_manager*)0);
   
   SimulatedBlock * fs = 0;
   {

--- 1.20/storage/ndb/src/kernel/vm/SimulatedBlock.hpp	2006-02-15 13:16:06 +01:00
+++ 1.21/storage/ndb/src/kernel/vm/SimulatedBlock.hpp	2006-02-16 13:12:22 +01:00
@@ -77,6 +77,8 @@
 
 struct Block_context
 {
+  Block_context(class Configuration& cfg, class Ndbd_mem_manager& mm)
+    : m_config(cfg), m_mm(mm) {}
   class Configuration& m_config;
   class Ndbd_mem_manager& m_mm;
 };