From f91475a7aa599463317c7f4f91547f0c5dcdef17 Mon Sep 17 00:00:00 2001
From: unknown <joerg@mysql.com>
Date: Wed, 9 Nov 2005 18:36:10 +0100
Subject: [PATCH] Compile fix for NDB 5.1.2 on Solaris, provided by Pekka.

---
 storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp | 8 +++++---
 storage/ndb/src/kernel/blocks/pgman.hpp       | 3 +++
 storage/ndb/src/kernel/blocks/restore.hpp     | 3 +++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp b/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
index 8a60c26b4ef..a9fef297bef 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
@@ -250,6 +250,7 @@ class Dbtup: public SimulatedBlock {
 friend class Suma;
 public:
 struct KeyReqStruct;
+friend struct KeyReqStruct; // CC
 typedef bool (Dbtup::* ReadFunction)(Uint32*,
                                      KeyReqStruct*,
                                      AttributeHeader*,
@@ -2345,14 +2346,15 @@ private:
 //---------------------------------------------------------------
 //
 // Public methods
-  Uint32* alloc_var_rec(Fragrecord*, Tablerec*, Uint32, Local_key*, Uint32*,
-			Uint32 base);
+  Uint32* alloc_var_rec(Fragrecord*const, Tablerec*const, Uint32, Local_key*,
+                        Uint32*, Uint32 base);
   void free_var_part(Fragrecord*, Tablerec*, Var_part_ref, Uint32 chain);
   void free_var_part(Fragrecord*, Tablerec*, Local_key*, Var_page*, Uint32 chain);
   
   void validate_page(Tablerec*, Var_page* page);
   
-  Uint32* alloc_fix_rec(Fragrecord*, Tablerec*, Local_key*, Uint32 *);
+  Uint32* alloc_fix_rec(Fragrecord*const, Tablerec*const, Local_key*,
+                        Uint32*);
   void free_fix_rec(Fragrecord*, Tablerec*, Local_key*, Fix_page*);
   
 // Private methods
diff --git a/storage/ndb/src/kernel/blocks/pgman.hpp b/storage/ndb/src/kernel/blocks/pgman.hpp
index 276cc60ee4c..da59afa5794 100644
--- a/storage/ndb/src/kernel/blocks/pgman.hpp
+++ b/storage/ndb/src/kernel/blocks/pgman.hpp
@@ -243,6 +243,9 @@ public:
 private:
   friend class Page_cache_client;
 
+  struct Page_entry; // CC
+  friend struct Page_entry;
+
   struct Page_request {
     enum Flags {
       OP_MASK       = 0x000F // 4 bits for TUP operation
diff --git a/storage/ndb/src/kernel/blocks/restore.hpp b/storage/ndb/src/kernel/blocks/restore.hpp
index 5654bcebd0e..12d093b4593 100644
--- a/storage/ndb/src/kernel/blocks/restore.hpp
+++ b/storage/ndb/src/kernel/blocks/restore.hpp
@@ -72,6 +72,9 @@ public:
   };
 private:
 
+  struct File; // CC
+  friend struct File;
+
   struct File 
   {
     File() {}