Commit bc12f673 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/export/space/pekka/ndb/version/my41
parents 9b3bfa5f bd556f0d

Build-tools/Do-compile

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ $ENV{'MYSQL_TCP_PORT'}= $mysql_tcp_port= 3334 + $opt_build_thread*2; 
$ENV{'MYSQL_UNIX_PORT'}=$mysql_unix_port="$opt_tmp/mysql$opt_suffix.build";

$ENV{"PERL5LIB"}="$pwd/$host/perl5:$pwd/$host/perl5/site_perl";

$slave_port=$mysql_tcp_port+16;

$ndbcluster_port= 9350 + $opt_build_thread*2;

$ndbcluster_port= 9350 + $opt_build_thread*4;

$manager_port=$mysql_tcp_port+1;

$mysqladmin_args="--no-defaults -u root --connect_timeout=5 --shutdown_timeout=20";

configure.in

+0 −10
Original line number Diff line number Diff line
@@ -1536,14 +1536,11 @@ then 
  fi

fi



TOOLS_LIBS="$NON_THREADED_CLIENT_LIBS"



# Should we use named pthread library ?

AC_MSG_CHECKING("named thread libs:")

if test "$with_named_thread" != "no"

then

  LIBS="$with_named_thread $LIBS $with_named_thread"

  TOOLS_LIBS="$with_named_thread $TOOLS_LIBS $with_named_thread"

  with_posix_threads="yes"

  with_mit_threads="no"

  AC_MSG_RESULT("$with_named_thread")
@@ -1562,9 +1559,7 @@ else 
    then

      AC_MSG_CHECKING("for pthread_create in -lpthread");

      ac_save_LIBS="$LIBS"

      ac_save_TOOLS_LIBS="$TOOLS_LIBS"

      LIBS="$LIBS -lpthread"

      TOOLS_LIBS="$TOOLS_LIBS -lpthread"

      AC_TRY_LINK(

      [#include <pthread.h>],

      [ (void) pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
@@ -1573,7 +1568,6 @@ else 
      if test "$with_posix_threads" = "no"

      then

        LIBS=" $ac_save_LIBS -lpthreads"

        TOOLS_LIBS=" $ac_save_TOOLS_LIBS -lpthreads"

        AC_MSG_CHECKING("for pthread_create in -lpthreads");

        AC_TRY_LINK(

        [#include <pthread.h>],
@@ -1584,7 +1578,6 @@ else 
        then

	  # This is for FreeBSD

	  LIBS="$ac_save_LIBS -pthread"

	  TOOLS_LIBS="$ac_save_TOOLS_LIBS -pthread"

	  AC_MSG_CHECKING("for pthread_create in -pthread");

	  AC_TRY_LINK(

	  [#include <pthread.h>],
@@ -1595,7 +1588,6 @@ else 
	  then

	    with_mit_threads="yes"

	    LIBS="$ac_save_LIBS"

	    TOOLS_LIBS="$ac_save_TOOLS_LIBS"

	  fi

	fi

      fi
@@ -3037,8 +3029,6 @@ AC_SUBST(sql_union_dirs) 
# Some usefull subst

AC_SUBST(CC)

AC_SUBST(GXX)

#Remove TOOLS_LIBS, because this is included in LIBRARIES

#AC_SUBST(TOOLS_LIBS)



# Set configuration options for make_binary_distribution

case $SYSTEM_TYPE in

ndb/include/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ ndb_version.h 


ndbapiinclude_HEADERS = \

ndbapi/ndbapi_limits.h \

ndbapi/ndb_opt_defaults.h \

ndbapi/Ndb.hpp \

ndbapi/NdbApi.hpp \

ndbapi/NdbConnection.hpp \

ndb/include/mgmapi/mgmapi_config_parameters.h

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ 
#define CFG_SHM_CHECKSUM              501

#define CFG_SHM_KEY                   502

#define CFG_SHM_BUFFER_MEM            503

#define CFG_SHM_SIGNUM                504



#define CFG_SCI_HOST1_ID_0            550

#define CFG_SCI_HOST1_ID_1            551

ndb/include/ndbapi/ndb_opt_defaults.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/* Copyright (C) 2003 MySQL AB



   This program is free software; you can redistribute it and/or modify

   it under the terms of the GNU General Public License as published by

   the Free Software Foundation; either version 2 of the License, or

   (at your option) any later version.



   This program is distributed in the hope that it will be useful,

   but WITHOUT ANY WARRANTY; without even the implied warranty of

   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

   GNU General Public License for more details.



   You should have received a copy of the GNU General Public License

   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



#ifndef NDB_OPT_DEFAULTS_H

#define NDB_OPT_DEFAULTS_H



#ifdef SIGRTMIN

#define OPT_NDB_SHM_SIGNUM_DEFAULT SIGRTMIN+2

#else

#define OPT_NDB_SHM_SIGNUM_DEFAULT 0

#endif

#define OPT_NDB_SHM_DEFAULT 0



#endif