Commit ef5c8dbf authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/jonas/src/mysql-4.1


configure.in:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  Auto merged
parents a6cb0e5f 876b4a59

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ miguel@light. 
miguel@light.local

miguel@sartre.local

mikael@mc04.(none)

mikael@orca.ndb.mysql.com

mikron@c-fb0ae253.1238-1-64736c10.cust.bredbandsbolaget.se

mikron@mikael-ronstr-ms-dator.local

mleich@mysql.com

acinclude.m4

+6 −1
Original line number Diff line number Diff line
@@ -1624,6 +1624,11 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [ 
  --without-ndb-debug   Disable special ndb debug features],

              [ndb_debug="$withval"],

              [ndb_debug="default"])

  AC_ARG_WITH([ndb-ccflags],

              [

  --with-ndb-ccflags    Extra CC options for ndb compile],

              [ndb_cxxflags_fix="$ndb_cxxflags_fix $withval"],

              [ndb_cxxflags_fix=$ndb_cxxflags_fix])



  AC_MSG_CHECKING([for NDB Cluster options])

  AC_MSG_RESULT([])

include/my_global.h

+6 −0
Original line number Diff line number Diff line
@@ -135,7 +135,13 @@ 
#ifdef HAVE_UNIXWARE7_THREADS

#include <thread.h>

#else

#if defined(HPUX10) || defined(HPUX11)

C_MODE_START			/* HPUX needs this, signal.h bug */

#include <pthread.h>

C_MODE_END

#else

#include <pthread.h>		/* AIX must have this included first */

#endif

#endif /* HAVE_UNIXWARE7_THREADS */

#endif /* HAVE_mit_thread */

#if !defined(SCO) && !defined(_REENTRANT)

mysql-test/lib/mtr_io.pl

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ use strict; 


sub mtr_get_pid_from_file ($);

sub mtr_get_opts_from_file ($);

sub mtr_fromfile ($);

sub mtr_tofile ($@);

sub mtr_tonewfile($@);
@@ -107,6 +108,8 @@ sub mtr_fromfile ($) { 
  open(FILE,"<",$file) or mtr_error("can't open file \"$file\": $!");

  my $text= join('', <FILE>);

  close FILE;

  $text =~ s/^\s+//;                    # Remove starting space, incl newlines

  $text =~ s/\s+$//;                    # Remove ending space, incl newlines

  return $text;

}

mysql-test/lib/mtr_process.pl

+465 −207

File changed.

Preview size limit exceeded, changes collapsed.