Commit 9ca7aadf 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


configure.in:
  Auto merged
parents 7223b9c1 3b658d07

configure.in

+2 −1
Original line number Diff line number Diff line
@@ -1144,7 +1144,8 @@ 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"

      # fix to handle include of <stdint.h> correctly on OSF1 with cxx compiler

      CXXFLAGS="$CXXFLAGS -I/usr/include/cxx -I/usr/include/cxx_cname -I/usr/include.dtk"

    ;;

  *netware*)

    # No need for curses library so set it to null

ndb/include/ndbapi/ndbapi_limits.h

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 


#define NDB_MAX_TUPLE_SIZE_IN_WORDS 1023

#define NDB_MAX_KEYSIZE_IN_WORDS 1023

#define NDB_MAX_KEY_SIZE NDB_MAX_KEYSIZE_IN_WORDS*sizeof(Uint32)

#define NDB_MAX_TUPLE_SIZE NDB_MAX_TUPLE_SIZE_IN_WORDS*sizeof(uint32)

#define NDB_MAX_KEY_SIZE (NDB_MAX_KEYSIZE_IN_WORDS*4)

#define NDB_MAX_TUPLE_SIZE (NDB_MAX_TUPLE_SIZE_IN_WORDS*4)

#define NDB_MAX_ACTIVE_EVENTS 100



#endif

sql/ha_ndbcluster.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#endif



#include <ndbapi_limits.h>

#include <ndb_types.h>



class Ndb;             // Forward declaration

class NdbOperation;    // Forward declaration