Commit 95b16dfa authored by unknown's avatar unknown
Browse files

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/mgmsrv/Services.cpp:
  Auto merged
parents 3c2dca47 e97a9d59

config/ac-macros/ha_ndbcluster.m4

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [ 
      AC_MSG_RESULT([Using NDB Cluster])

      AC_DEFINE([HAVE_NDBCLUSTER_DB], [1], [Using Ndb Cluster DB])

      have_ndbcluster="yes"

      ndbcluster_includes="-I../ndb/include -I../ndb/include/ndbapi"

      ndbcluster_includes="-I../ndb/include -I../ndb/include/ndbapi -I../ndb/include/mgmapi"

      ndbcluster_libs="\$(top_builddir)/ndb/src/.libs/libndbclient.a"

      ndbcluster_system_libs=""

      ndb_mgmclient_libs="\$(top_builddir)/ndb/src/mgmclient/libndbmgmclient.la"

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -1872,7 +1872,7 @@ AC_CHECK_FUNCS(alarm bcmp bfill bmove bzero chsize cuserid fchmod fcntl \ 
  realpath rename rint rwlock_init setupterm \

  shmget shmat shmdt shmctl sigaction sigemptyset sigaddset \

  sighold sigset sigthreadmask \

  snprintf socket stpcpy strcasecmp strerror strnlen strpbrk strstr strtol \

  snprintf socket stpcpy strcasecmp strerror strsignal strnlen strpbrk strstr strtol \

  strtoll strtoul strtoull tell tempnam thr_setconcurrency vidattr)



#

extra/perror.c

+6 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <my_getopt.h>

#ifdef HAVE_NDBCLUSTER_DB

#include "../ndb/src/ndbapi/ndberror.c"

#include "../ndb/src/kernel/error/ndbd_exit_codes.c"

#endif



static my_bool verbose, print_all_codes;
@@ -235,8 +236,11 @@ int main(int argc,char *argv[]) 
#ifdef HAVE_NDBCLUSTER_DB

      if (ndb_code)

      {

	if (ndb_error_string(code, ndb_string,  sizeof(ndb_string)) < 0)

	if ((ndb_error_string(code, ndb_string, sizeof(ndb_string)) < 0) &&

	    (ndbd_exit_string(code, ndb_string, sizeof(ndb_string)) < 0))

	{

	    msg= 0;

	}

	else

	  msg= ndb_string;

      }

ndb/include/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ mgmapi/mgmapi.h \ 
mgmapi/mgmapi_debug.h \

mgmapi/mgmapi_config_parameters.h \

mgmapi/mgmapi_config_parameters_debug.h \

mgmapi/ndb_logevent.h

mgmapi/ndb_logevent.h \

mgmapi/ndbd_exit_codes.h



noinst_HEADERS = \

ndb_global.h \

ndb/include/kernel/signaldata/EventReport.hpp

+16 −2
Original line number Diff line number Diff line
@@ -68,21 +68,35 @@ public: 
     4) Add SentHeartbeat in EventLogger::getText()



   */

  void setNodeId(Uint32 nodeId);

  Uint32 getNodeId() const;

  void setEventType(Ndb_logevent_type type);

  Ndb_logevent_type getEventType() const;

  UintR eventType;    // DATA 0

};



inline

void

EventReport::setNodeId(Uint32 nodeId){

  eventType = (nodeId << 16) | (eventType & 0xFFFF);

}



inline

Uint32

EventReport::getNodeId() const {

  return eventType >> 16;

}



inline

void

EventReport::setEventType(Ndb_logevent_type type){

  eventType = (UintR) type;

  eventType = (eventType & 0xFFFF0000) | (((UintR) type) & 0xFFFF);

}



inline

Ndb_logevent_type

EventReport::getEventType() const {

  return (Ndb_logevent_type)eventType;

  return (Ndb_logevent_type)(eventType & 0xFFFF);

}



#endif