Commit 3fc3c084 authored by unknown's avatar unknown
Browse files

remove OSE 


BitKeeper/deleted/.del-NdbErrHnd.cpp:
  Delete: storage/ndb/src/common/util/NdbErrHnd.cpp
BitKeeper/deleted/.del-MemoryChannelOSE.hpp:
  Delete: storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelOSE.hpp
BitKeeper/deleted/.del-Makefile:
  Delete: storage/ndb/src/common/transporter/priotest/prioOSE/Makefile
BitKeeper/deleted/.del-OSE_Receiver.cpp:
  Delete: storage/ndb/src/common/transporter/OSE_Receiver.cpp
BitKeeper/deleted/.del-OSE_Receiver.hpp:
  Delete: storage/ndb/src/common/transporter/OSE_Receiver.hpp
BitKeeper/deleted/.del-OSE_Signals.hpp:
  Delete: storage/ndb/src/common/transporter/OSE_Signals.hpp
BitKeeper/deleted/.del-OSE_Transporter.cpp:
  Delete: storage/ndb/src/common/transporter/OSE_Transporter.cpp
BitKeeper/deleted/.del-OSE_Transporter.hpp:
  Delete: storage/ndb/src/common/transporter/OSE_Transporter.hpp
BitKeeper/deleted/.del-mmslist.cpp:
  Delete: storage/ndb/src/common/portlib/mmslist.cpp
parent 1577b962

storage/ndb/include/logger/Logger.hpp

+0 −2
Original line number Diff line number Diff line
@@ -155,8 +155,6 @@ public: 
  /**

   * Create a default handler that logs to the syslog.

   *

   * On OSE a ConsoleHandler will be created since there is no syslog support.

   *

   * @return true if successful.

   */

  bool createSyslogHandler();

storage/ndb/include/mgmapi/mgmapi_config_parameters.h

+4 −4
Original line number Diff line number Diff line
@@ -149,9 +149,9 @@ 
#define CFG_SCI_SEND_LIMIT            554

#define CFG_SCI_BUFFER_MEM            555



#define CFG_OSE_PRIO_A_SIZE           602

#define CFG_OSE_PRIO_B_SIZE           603

#define CFG_OSE_RECEIVE_ARRAY_SIZE    604

#define CFG_602                       602 // Removed: was OSE

#define CFG_603                       603 // Removed: was OSE

#define CFG_604                       604 // Removed: was OSE



/**

 * API Config variables
@@ -178,6 +178,6 @@ 
#define CONNECTION_TYPE_TCP           0

#define CONNECTION_TYPE_SHM           1

#define CONNECTION_TYPE_SCI           2

#define CONNECTION_TYPE_OSE           3

#define CONNECTION_TYPE_OSE           3 // Removed.



#endif

storage/ndb/include/ndbapi/Ndb.hpp

+1 −11
Original line number Diff line number Diff line
@@ -501,12 +501,11 @@ 
  

   There are four conditions leading to the transfer of database 

   operations from Ndb object buffers to the NDB kernel:

   -# The NDB Transporter (TCP/IP, OSE, SCI or shared memory)

   -# The NDB Transporter (TCP/IP, SCI or shared memory)

      decides that a buffer is full and sends it off. 

      The buffer size is implementation-dependent and

      may change between MySQL Cluster releases.

      On TCP/IP the buffer size is usually around 64 KB;

      on OSE/Delta it is usually less than 2000 bytes. 

      Since each Ndb object provides a single buffer per storage node, 

      the notion of a "full" buffer is local to this storage node.

   -# The accumulation of statistical data on transferred information
@@ -991,16 +990,7 @@ template <class T> struct Ndb_free_list_t; 


typedef void (* NdbEventCallback)(NdbEventOperation*, Ndb*, void*);



#if defined NDB_OSE

/**

 * Default time to wait for response after request has been sent to 

 * NDB Cluster (Set to 10 seconds usually, but to 100 s in 

 * the OSE operating system)

 */

#define WAITFOR_RESPONSE_TIMEOUT 100000 // Milliseconds

#else

#define WAITFOR_RESPONSE_TIMEOUT 120000 // Milliseconds

#endif



#define NDB_SYSTEM_DATABASE "sys"

#define NDB_SYSTEM_SCHEMA "def"

storage/ndb/include/portlib/NdbMain.h

+0 −40
Original line number Diff line number Diff line
@@ -17,50 +17,10 @@ 
#ifndef NDBMAIN_H

#define NDBMAIN_H



#if defined NDB_SOFTOSE || defined NDB_OSE

#include <ose.h>

#include <shell.h>



/* Define an OSE_PROCESS that can be started from osemain.con */

#define NDB_MAIN(name)                          \

int main_ ## name(int argc, const char** argv); \

OS_PROCESS(name){                               \

  main_ ## name(0, 0);                          \

  stop(current_process());                      \

  exit(0);                                      \

}                                               \

int main_ ## name(int argc, const char** argv)



/*  Define an function that can be started from the command line */

#define NDB_COMMAND(name, str_name, syntax, description, stacksize) \

int main_ ## name(int argc, const char** argv);  \

                                                 \

static int run_ ## name(int argc, char *argv[]){ \

 return main_ ## name (argc, argv);              \

}                                                \

                                                 \

OS_PROCESS(init_ ## name){                       \

 shell_add_cmd_attrs(str_name, syntax, description, \

          run_ ## name, OS_PRI_PROC, 25, stacksize); \

 stop(current_process());                        \

 return;                                         \

}                                                \

                                                 \

int main_ ## name(int argc, const char** argv)









#else



#define NDB_MAIN(name) \

int main(int argc, const char** argv)



#define NDB_COMMAND(name, str_name, syntax, description, stacksize) \

int main(int argc, const char** argv)





#endif





#endif

storage/ndb/include/portlib/NdbMutex.h

+1 −4
Original line number Diff line number Diff line
@@ -28,10 +28,7 @@ 
extern "C" {

#endif



#if defined NDB_OSE || defined NDB_SOFTOSE

#include <ose.h>

typedef SEMAPHORE NdbMutex;

#elif defined NDB_WIN32

#if defined NDB_WIN32

typedef CRITICAL_SECTION NdbMutex;

#else

#include <pthread.h>