Commit f7c8bd0e authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Portability fixes for 4.0.3 build. 

Don't update MyISAM index file on UPDATE if index is not changed
parent ca2e3aac

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -491,3 +491,5 @@ sql-bench/innotest1b 
sql-bench/innotest2

sql-bench/innotest2a

sql-bench/innotest2b

myisam/test2.MYD

myisam/test2.MYI

Build-tools/Do-compile

+20 −12
Original line number Diff line number Diff line
@@ -75,6 +75,19 @@ $ENV{"PERL5LIB"}="$pwd/$host/perl5:$pwd/$host/perl5/site_perl"; 
$slave_port=$mysql_tcp_port+16;

$manager_port=$mysql_tcp_port+1;



if ($opt_stage == 0)

{

  system("mkdir Logs") if (! -d "Logs");

  system("mv $log ${log}-old") if (-f $log);

  unlink($log);

}



open(LOG,">>$log") || abort("Can't open log file, error $?");

select LOG;

$|=1;

select STDOUT;

$|=1;



if (-x "$host/bin/mysqladmin")

{

  log_system("$host/bin/mysqladmin --no-defaults -u root -S $mysql_unix_port -s shutdown");
@@ -97,17 +110,8 @@ if ($opt_stage == 0) 
  }

  rm_all("$host/test");

  system("mkdir $host/test") if (! -d "$host/test");

  system("mkdir Logs") if (! -d "Logs");

  system("mv $log ${log}-old") if (-f $log);

  unlink($log);

}



open(LOG,">>$log") || abort("Can't open log file, error $?");

select LOG;

$|=1;

select STDOUT;

$|=1;



safe_cd($host);

if ($opt_stage == 0 && ! $opt_use_old_distribution)

{
@@ -555,11 +559,15 @@ sub kill_all 
  my ($pattern) = @_;

  my ($USER,$BSD,$LINUX, $pscmd, $user, $pid);

  $user=$ENV{'USER'};

  $BSD = -f '/vmunix' || $ENV{"OS"} eq "SunOS4";

  $BSD = -f '/vmunix' || $ENV{"OS"} eq "SunOS4" || $^O eq 'darwin';

  $LINUX = $^O eq 'linux';

  $pscmd = $BSD ? "/bin/ps -auxww" : $LINUX ? "/bin/ps axuw" : "/bin/ps -ef";



  open(PS, "$pscmd|") || die "can't run $pscmd: $!";

  if (!open(PS, "$pscmd|"))

  {

    print "Warning: Can't run $pscmd: $!\n";

    exit;

  }



  # Catch any errors with eval.  A bad pattern, for instance.

 process:

Docs/manual.texi

+3 −1
Original line number Diff line number Diff line
@@ -8828,7 +8828,7 @@ To get a core dump on Linux if @code{mysqld} dies with a @code{SIGSEGV} signal, 
you can start @code{mysqld} with the @code{--core-file} option.  Note

that you also probably need to raise the @code{core file size} by adding

@code{ulimit -c 1000000} to @code{safe_mysqld} or starting

@code{safe_mysqld} with @code{--core-file-sizes=1000000}.

@code{safe_mysqld} with @code{--core-file-size=1000000}.

@xref{safe_mysqld, , @code{safe_mysqld}}.















If you are linking your own MySQL client and get the error:










@@ -50261,6 +50261,8 @@ each individual 4.0.x release.



























@itemize @bullet















@item













Don't update MyISAM index file on update if not strictly necessary.













@item















Fixed bug in @code{SELECT DISTINCT ... FROM many_tables ORDER BY















not-used-column}.















@item

























include/my_semaphore.h



+1
−1






























Original line number
Diff line number
Diff line








@@ -34,7 +34,7 @@













C_MODE_START















#ifdef HAVE_SEMAPHORE_H















#include <semaphore.h>













#elif defined(__bsdi__)













#elif !defined(__bsdi__)















#ifdef __WIN__















typedef HANDLE sem_t;















#else

































innobase/configure.in



+2
−0






























Original line number
Diff line number
Diff line








@@ -97,6 +97,8 @@ case "$target_os" in













       sysv5uw7*)















	 # Problem when linking on SCO















	 CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;













	*-openbsd*)













	 CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;















esac































case "$target" in