Commit a6bfe13c authored by unknown's avatar unknown
Browse files

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 

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


Build-tools/Do-compile:
  Auto merged
configure.in:
  Auto merged
parents cca25e4d 418a0630

Build-tools/Do-compile

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,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
@@ -1531,14 +1531,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")
@@ -1557,9 +1554,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); ],
@@ -1568,7 +1563,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>],
@@ -1579,7 +1573,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>],
@@ -1590,7 +1583,6 @@ else 
	  then

	    with_mit_threads="yes"

	    LIBS="$ac_save_LIBS"

	    TOOLS_LIBS="$ac_save_TOOLS_LIBS"

	  fi

	fi

      fi
@@ -2656,8 +2648,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