Commit e223c07e authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:irix 

into eel.hemma.oreland.se:/ndb/clone-mysql-4.1-ndb-daily-2004-08-04


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/test/ndbapi/testBasic.cpp:
  Auto merged
ndb/test/run-test/main.cpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
parents 22306d05 ebe79c0b

BUILD/compile-irix-mips64-mipspro

+4 −4
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ if [ ! -f "sql/mysqld.cc" ]; then 
fi



cflags="-64 -mips4"



config_args=

if [ "$#" != 0 ]; then

  case "$1" in

    --help)
@@ -25,8 +25,7 @@ if [ "$#" != 0 ]; then 
      cflags=""

      ;;

    *)

      echo "$0: invalid option '$1'; use --help to show usage"

      exit 1

      config_args="$config_args $1"; shift

      ;;

  esac

else
@@ -79,6 +78,7 @@ cxxflags="$cxxflags -LANG:libc_in_namespace_std=OFF" 
CC=cc CXX=CC CFLAGS="$cflags" CXXFLAGS="$cxxflags" \

./configure --prefix=/usr/local/mysql --disable-shared \

            --with-extra-charsets=complex --enable-thread-safe-client \

            --without-extra-tools --disable-dependency-tracking

            --without-extra-tools --disable-dependency-tracking \

            $config_args



make

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ mysql@home.(none) 
mysqldev@build.mysql2.com

mysqldev@melody.local

mysqldev@mysql.com

mysqldev@o2k.irixworld.net

ndbdev@eel.hemma.oreland.se

ndbdev@ndbmaster.mysql.com

nick@mysql.com

ndb/include/kernel/NodeState.hpp

+11 −4
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ public: 
  NodeState(StartLevel);

  NodeState(StartLevel, bool systemShutdown);

  NodeState(StartLevel, Uint32 startPhase, StartType);

  void init();

 

  /**

   * Current start level
@@ -180,6 +181,12 @@ public: 


inline

NodeState::NodeState(){

  init();

}



inline

void

NodeState::init(){

  startLevel = SL_CMVMI;

  nodeGroup = 0xFFFFFFFF;

  dynamicId = 0xFFFFFFFF;
@@ -190,7 +197,7 @@ NodeState::NodeState(){ 


inline

NodeState::NodeState(StartLevel sl){

  NodeState::NodeState();

  init();

  startLevel = sl;

  singleUserMode = 0;

  singleUserApi = 0xFFFFFFFF;
@@ -198,7 +205,7 @@ NodeState::NodeState(StartLevel sl){ 


inline

NodeState::NodeState(StartLevel sl, Uint32 sp, StartType typeOfStart){

  NodeState::NodeState();

  init();

  startLevel = sl;

  starting.startPhase = sp;

  starting.restartType = typeOfStart;
@@ -208,7 +215,7 @@ NodeState::NodeState(StartLevel sl, Uint32 sp, StartType typeOfStart){ 


inline

NodeState::NodeState(StartLevel sl, bool sys){

  NodeState::NodeState();

  init();

  startLevel = sl;

  stopping.systemShutdown = sys;

  singleUserMode = 0;

ndb/include/kernel/signaldata/SignalData.hpp

+3 −13
Original line number Diff line number Diff line
@@ -21,20 +21,10 @@ 
#include <ndb_limits.h>

#include <kernel_types.h>



#ifndef NDB_ASSERT

#ifdef VM_TRACE

#define NDB_ASSERT(test, message) { if(!(test)) { printf(message); exit(-1); }}

#else

#define NDB_ASSERT(test, message)

#endif

#endif



// Useful ASSERT macros...

#define ASSERT_BOOL(flag, message) NDB_ASSERT( (flag<=1), (message) )

#define ASSERT_BOOL(flag, message) assert(flag<=1)

#define ASSERT_RANGE(value, min, max, message) \

 NDB_ASSERT((value) >= (min) && (value) <= (max), (message))

#define ASSERT_MAX(value, max, message) \

 NDB_ASSERT((value) <= (max), (message))

 assert((value) >= (min) && (value) <= (max))

#define ASSERT_MAX(value, max, message) assert((value) <= (max))



#define SECTION(x) STATIC_CONST(x)

ndb/include/mgmcommon/MgmtErrorReporter.hpp

+0 −6
Original line number Diff line number Diff line
@@ -63,12 +63,6 @@ 
// Returns: -

//****************************************************************************



#ifndef NDB_ASSERT

#define NDB_ASSERT(trueToContinue, message) \

    if ( !(trueToContinue) ) { \

ndbout << "ASSERT FAILED. FILE: " << __FILE__ << ", LINE: " << __LINE__ << ", MSG: " << message << endl;exit(-1);}

#endif



#define MGM_REQUIRE(x) \

  if (!(x)) { ndbout << __FILE__ << " " << __LINE__ \

    << ": Warning! Requirement failed" << endl; }