From dbd2625fd7edb9cf50f140044dc4ddde46d8dd6c Mon Sep 17 00:00:00 2001
From: unknown <joreland@mysql.com>
Date: Tue, 24 Aug 2004 14:48:07 +0200
Subject: [PATCH] Compile fix sol9x86

ndb/src/kernel/blocks/grep/Grep.hpp:
  Remove own addRecSignal-methods
ndb/src/kernel/blocks/grep/GrepInit.cpp:
  Remove own addRecSignal-methods
ndb/src/mgmsrv/MgmtSrvr.cpp:
  #ifdef SUNPRO_CC 5.6
ndb/src/ndbapi/NdbEventOperation.cpp:
  Compile fix
ndb/src/ndbapi/NdbScanFilter.cpp:
  #ifdef SUNPRO_CC 5.6
ndb/src/ndbapi/TransporterFacade.hpp:
  Compile fix
ndb/test/ndbapi/testIndex.cpp:
  Compile fix
---
 ndb/src/kernel/blocks/grep/Grep.hpp     | 15 +--------------
 ndb/src/kernel/blocks/grep/GrepInit.cpp |  2 +-
 ndb/src/mgmsrv/MgmtSrvr.cpp             |  2 ++
 ndb/src/ndbapi/NdbEventOperation.cpp    |  2 +-
 ndb/src/ndbapi/NdbScanFilter.cpp        |  3 ++-
 ndb/src/ndbapi/TransporterFacade.hpp    |  2 ++
 ndb/test/ndbapi/testIndex.cpp           |  2 ++
 7 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/ndb/src/kernel/blocks/grep/Grep.hpp b/ndb/src/kernel/blocks/grep/Grep.hpp
index ba8f5780522..eeabac36966 100644
--- a/ndb/src/kernel/blocks/grep/Grep.hpp
+++ b/ndb/src/kernel/blocks/grep/Grep.hpp
@@ -148,7 +148,7 @@ private:
  */
 class Grep : public SimulatedBlock //GrepParticipant
 {
-  //BLOCK_DEFINES(Grep);
+  BLOCK_DEFINES(Grep);
 
 public:
   Grep(const Configuration & conf);
@@ -519,19 +519,6 @@ public:
   typedef void (Grep::* ExecSignalLocal1) (Signal* signal); 
   typedef void (Grep::PSCoord::* ExecSignalLocal2) (Signal* signal); 
   typedef void (Grep::PSPart::* ExecSignalLocal4) (Signal* signal); 
-
-  void 
-  addRecSignal(GlobalSignalNumber gsn, ExecSignalLocal1 f, bool force = false){
-    addRecSignalImpl(gsn, (ExecFunction)f, force);
-  }
-  void 
-  addRecSignal(GlobalSignalNumber gsn, ExecSignalLocal2 f, bool force = false){
-    addRecSignalImpl(gsn, (ExecFunction)f, force);
-  }
-  void 
-  addRecSignal(GlobalSignalNumber gsn, ExecSignalLocal4 f, bool force = false){
-    addRecSignalImpl(gsn, (ExecFunction)f, force);
-  }
 };
 
 
diff --git a/ndb/src/kernel/blocks/grep/GrepInit.cpp b/ndb/src/kernel/blocks/grep/GrepInit.cpp
index 70bf6678754..cfb454a1f9b 100644
--- a/ndb/src/kernel/blocks/grep/GrepInit.cpp
+++ b/ndb/src/kernel/blocks/grep/GrepInit.cpp
@@ -132,7 +132,7 @@ Grep::~Grep()
 {
 }
 
-//BLOCK_FUNCTIONS(Grep);
+BLOCK_FUNCTIONS(Grep);
 
 Grep::PSPart::PSPart(Grep * sb) :
   BlockComponent(sb),
diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/ndb/src/mgmsrv/MgmtSrvr.cpp
index 587d5a7572d..2c1af3b88da 100644
--- a/ndb/src/mgmsrv/MgmtSrvr.cpp
+++ b/ndb/src/mgmsrv/MgmtSrvr.cpp
@@ -2885,4 +2885,6 @@ MgmtSrvr::setDbParameter(int node, int param, const char * value,
 }
 
 template class Vector<SigMatch>;
+#if __SUNPRO_CC != 0x560
 template bool SignalQueue::waitFor<SigMatch>(Vector<SigMatch>&, SigMatch*&, NdbApiSignal*&, unsigned);
+#endif
diff --git a/ndb/src/ndbapi/NdbEventOperation.cpp b/ndb/src/ndbapi/NdbEventOperation.cpp
index ebdebaffd61..506a6c8d86d 100644
--- a/ndb/src/ndbapi/NdbEventOperation.cpp
+++ b/ndb/src/ndbapi/NdbEventOperation.cpp
@@ -37,7 +37,7 @@
 
 NdbEventOperation::NdbEventOperation(Ndb *theNdb, 
 				     const char* eventName, 
-				     const int bufferLength) 
+				     int bufferLength) 
   : m_impl(* new NdbEventOperationImpl(*this,theNdb, 
 				       eventName, 
 				       bufferLength))
diff --git a/ndb/src/ndbapi/NdbScanFilter.cpp b/ndb/src/ndbapi/NdbScanFilter.cpp
index eace1a0acf5..3813ab139de 100644
--- a/ndb/src/ndbapi/NdbScanFilter.cpp
+++ b/ndb/src/ndbapi/NdbScanFilter.cpp
@@ -778,7 +778,8 @@ main(void){
 #endif
 
 template class Vector<NdbScanFilterImpl::State>;
+#if __SUNPRO_CC != 0x560
 template int NdbScanFilterImpl::cond_col_const(Interpreter::BinaryCondition, Uint32 attrId, Uint32);
 template int NdbScanFilterImpl::cond_col_const(Interpreter::BinaryCondition, Uint32 attrId, Uint64);
-
+#endif
 
diff --git a/ndb/src/ndbapi/TransporterFacade.hpp b/ndb/src/ndbapi/TransporterFacade.hpp
index 60ea3625524..14da4b11aa1 100644
--- a/ndb/src/ndbapi/TransporterFacade.hpp
+++ b/ndb/src/ndbapi/TransporterFacade.hpp
@@ -161,7 +161,9 @@ private:
   /**
    * Block number handling
    */
+public:
   static const unsigned MAX_NO_THREADS = 4711;
+private:
 
   struct ThreadData {
     static const Uint32 ACTIVE = (1 << 16) | 1;
diff --git a/ndb/test/ndbapi/testIndex.cpp b/ndb/test/ndbapi/testIndex.cpp
index a0844cee8f8..6ebbfd8b680 100644
--- a/ndb/test/ndbapi/testIndex.cpp
+++ b/ndb/test/ndbapi/testIndex.cpp
@@ -386,6 +386,7 @@ sync_down(NDBT_Context* ctx){
   if(threads){
     ctx->decProperty("PauseThreads");
   }
+  return 0;
 }
 
 int
@@ -397,6 +398,7 @@ sync_up_and_wait(NDBT_Context* ctx){
   if(threads){
     ndbout_c("wait completed");
   }
+  return 0;
 }
 
 int