Commit f74303af authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
parents 8c391e7c 2f6dc470

configure.in

+1 −0
Original line number Diff line number Diff line
@@ -1144,6 +1144,7 @@ dnl Is this the right match for DEC OSF on alpha? 
      # gethostbyname_r is deprecated and doesn't work ok on OSF1

      CFLAGS="$CFLAGS -DUNDEF_HAVE_GETHOSTBYNAME_R"

      CXXFLAGS="$CXXFLAGS -DUNDEF_HAVE_GETHOSTBYNAME_R"

      ndb_cxxflags_fix="$ndb_cxxflags_fix -I/usr/include.dtk"

    ;;

  *netware*)

    # No need for curses library so set it to null

ndb/include/kernel/signaldata/UpgradeStartup.hpp

+2 −0
Original line number Diff line number Diff line 
#ifndef NDB_UPGRADE_STARTUP

#define NDB_UPGRADE_STARTUP



class Ndbcntr;



struct UpgradeStartup {



  static void installEXEC(SimulatedBlock*);

ndb/include/ndb_global.h

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ 
#undef NDB_WIN32

#endif



#ifdef _AIX

#undef _H_STRINGS

#endif

#include <m_string.h>

#include <m_ctype.h>

#include <ndb_types.h>

ndb/include/ndb_types.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ typedef unsigned int UintR; 
#ifdef __SIZE_TYPE__

typedef __SIZE_TYPE__ UintPtr;

#else

#include <my_global.h>

#include <ndb_global.h>

#ifdef HAVE_STDINT_H

#include <stdint.h>

#endif

ndb/include/ndbapi/Ndb.hpp

+1 −0
Original line number Diff line number Diff line
@@ -881,6 +881,7 @@ class Table; 
class BaseString;

class NdbEventOperation;

class NdbBlob;

class NdbReceiver;



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