Commit bdf4e17f authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bk/mysql-4.1 

into mysql.com:/users/kboortz/daily/work/mysql-4.1-sjis
parents bf29d8de 236e588a

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/LogLevel.hpp

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ public: 
  LogLevel & operator= (const LogLevel &);



  enum EventCategory {

    llInvalid = -1,

    llStartUp = CFG_LOGLEVEL_STARTUP - CFG_MIN_LOGLEVEL,

    llShutdown = CFG_LOGLEVEL_SHUTDOWN - CFG_MIN_LOGLEVEL,

    llStatistic = CFG_LOGLEVEL_STATISTICS - CFG_MIN_LOGLEVEL,

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/mgmapi/mgmapi.h

+4 −1
Original line number Diff line number Diff line
@@ -271,7 +271,10 @@ extern "C" { 
   *   Log categories

   */

  enum ndb_mgm_event_category {

    NDB_MGM_ILLEGAL_EVENT_CATEGORY = -1,     /*< Invalid

    /**

     * Invalid

     */

    NDB_MGM_ILLEGAL_EVENT_CATEGORY = -1,

    /**

     * Events during all kinds of startups

     */

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>