Commit 184ef91d authored by monty@mashka.mysql.fi's avatar monty@mashka.mysql.fi
Browse files

Merge

parents b8bf46ca b17eea55

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -28,3 +28,4 @@ serg@sergbook.mysql.com 
sinisa@rhols221.adsl.netsonic.fi

zak@balfor.local

bar@bar.mysql.r18.ru

paul@teton.kitebird.com

Build-tools/Do-compile

+49 −20
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 


use Getopt::Long;

$opt_distribution=$opt_user=$opt_result=$opt_config_options=$opt_config_env="";

$opt_dbd_options=$opt_perl_options=$opt_suffix="";

$opt_dbd_options=$opt_perl_options=$opt_make_options=$opt_suffix="";

$opt_tmp=$opt_version_suffix="";

$opt_help=$opt_Information=$opt_delete=$opt_debug=$opt_stage=$opt_rsh_mail=$opt_no_test=$opt_no_perl=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_no_mysqltest=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=0;

$opt_innodb=$opt_bdb=0;

$opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=0;



GetOptions("Information","help","distribution=s","user=s","result=s","delete","no-test","no-mysqltest","perl-files=s","debug","config-options=s","config-env=s","stage=i","rsh-mail","with-low-memory","fast-benchmark","tmp=s","static-client","static-server","static-perl","no-perl","local-perl","perl-options=s","sur","with-small-disk","dbd-options=s","tcpip","suffix=s","build-thread=i","innodb","bdb","use-old-distribution","enable-shared","no-crash-me","no-strip","version-suffix=s", "with-other-libc=s") || usage();

GetOptions("Information","help","distribution=s","user=s","result=s","delete","no-test","no-mysqltest","perl-files=s","debug","config-options=s","config-env=s","stage=i","rsh-mail","with-low-memory","fast-benchmark","tmp=s","static-client","static-server","static-perl","no-perl","local-perl","perl-options=s","make-options=s","sur","with-small-disk","dbd-options=s","tcpip","suffix=s","build-thread=i","innodb","bdb","raid","libwrap","use-old-distribution","enable-shared","no-crash-me","no-strip","version-suffix=s", "with-other-libc=s") || usage();



usage() if ($opt_help || $opt_Information);

usage() if (!$opt_distribution);
@@ -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,25 +110,22 @@ 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)

{

  safe_system("gunzip < $opt_distribution | $tar xf -");



  # Fix file times; This is needed because the time for files may be

  # in the future

  system("touch timestamp; find . -newer timestamp -print | xargs touch; rm -f timestamp");

  # in the future.  The following is done this way to ensure that

  # we don't get any errors from xargs touch

  system("touch timestamp");

  sleep(2);

  system("touch timestamp2");

  system("find . -newer timestamp -print | xargs touch");

  unlink("timestamp");

  unlink("timestamp2");

  sleep(2);

  # Ensure that files we don't want to rebuild are newer than other files

  safe_cd($ver);
@@ -150,6 +160,7 @@ if ($opt_stage <= 1) 
  if ($opt_with_other_libc)

  {

    $opt_with_other_libc= "--with-other-libc=$opt_with_other_libc";

    $opt_config_options.= " $opt_with_other_libc";

  }

  if (!$opt_enable_shared)

  {
@@ -159,11 +170,19 @@ if ($opt_stage <= 1) 
  {

    $opt_config_options.= " --with-berkeley-db"

  }

  if ($opt_raid)

  {

    $opt_config_options.= " --with-raid"

  }

  if ($opt_innodb)

  {

    $opt_config_options.= " --with-innodb"

  }

  check_system("$opt_config_env ./configure --prefix=/usr/local/mysql \"--with-comment=Official MySQL$opt_version_suffix binary\" --with-extra-charsets=complex \"--with-server-suffix=$opt_version_suffix\" --enable-thread-safe-client --enable-local-infile $opt_config_options","Thank you for choosing MySQL");

  if ($opt_libwrap)

  {

    $opt_config_options.= " --with-libwrap"

  }

  check_system("$opt_config_env ./configure --prefix=/usr/local/mysql --with-comment=\"Official MySQL$opt_version_suffix binary\" --with-extra-charsets=complex --with-server-suffix=\"$opt_version_suffix\" --enable-thread-safe-client --enable-local-infile $opt_config_options","Thank you for choosing MySQL");

  if (-d "$pwd/$host/include-mysql")

  {

    safe_system("cp -r $pwd/$host/include-mysql/* $pwd/$host/$ver/include");
@@ -172,8 +191,11 @@ if ($opt_stage <= 1) 


if ($opt_stage <= 2)

{

  my ($command);

  unlink($opt_distribution) if ($opt_delete && !$opt_use_old_distribution);

  safe_system("$make");

  $command=$make;

  $command.= " $opt_make_options" if (defined($opt_make_options) && $opt_make_options ne "");

  safe_system($command);

}



#
@@ -368,6 +390,9 @@ To set up the environment, like 'CC=cc CXX=gcc CXXFLAGS=-O3' 
--dbd-options 'options'

Options for Makefile.PL when configuring msql-mysql-modules.



--make-options 'options'

Options to make after configure. (Like 'CXXLD=gcc')



--version-suffix suffix

Can be used to set a suffix (normally 'com' or '-max') for a distribution
@@ -549,11 +574,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

+4 −1
Original line number Diff line number Diff line
@@ -46929,11 +46929,14 @@ not yet 100% confident in this code. 
@appendixsubsec Changes in release 3.23.53

@itemize @bullet

@item

Fixed a @code{BDB}-related @code{ALTER TABLE} bug with dropping a column

and shutting down immediately thereafter.

@item

Fixed problem with @code{configure ... --localstatedir=...}.

@item

Fixed problem with @code{UNSIGNED BIGINT} on AIX (again).

@item

Fixed bug in pthread_mutex_trylock() on HPUX 11.0

Fixed bug in pthread_mutex_trylock() on HPUX 11.0.

@item

Multithreaded stress tests for InnoDB.

@end itemize

innobase/configure.in

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ case "$target_os" in 
	 CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE -DUNIV_HPUX -DUNIV_HPUX10";;

       hp*)

	 CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE -DUNIV_HPUX";;

       aix*)

         CFLAGS="$CFLAGS -DUNIV_AIX";;

       irix*)

	 CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;

       osf*)

innobase/os/os0file.c

+25 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Created 10/21/1995 Heikki Tuuri 
#include "ut0mem.h"

#include "srv0srv.h"

#include "fil0fil.h"

#include "buf0buf.h"



#undef HAVE_FDATASYNC
@@ -2108,6 +2109,7 @@ os_aio_simulated_handle( 
	ibool		ret;

	ulint		n;

	ulint		i;

	ulint		len2;

	

	segment = os_aio_get_array_and_local_segment(&array, global_segment);
@@ -2263,6 +2265,29 @@ os_aio_simulated_handle( 


	/* Do the i/o with ordinary, synchronous i/o functions: */

	if (slot->type == OS_FILE_WRITE) {

		if (array == os_aio_write_array) {



			/* Do a 'last millisecond' check that the page end

			is sensible; reported page checksum errors from

			Linux seem to wipe over the page end */



			for (len2 = 0; len2 + UNIV_PAGE_SIZE <= total_len;

						len2 += UNIV_PAGE_SIZE) {

				if (mach_read_from_4(combined_buf + len2

						+ FIL_PAGE_LSN + 4)

				    != mach_read_from_4(combined_buf + len2

				    		+ UNIV_PAGE_SIZE

				    		- FIL_PAGE_END_LSN + 4)) {

				    	ut_print_timestamp(stderr);

				    	fprintf(stderr,

"  InnoDB: ERROR: The page to be written seems corrupt!\n");

					page_print(combined_buf + len2);

				    	fprintf(stderr,

"InnoDB: ERROR: The page to be written seems corrupt!\n");

				}

			}

		}

	

		ret = os_file_write(slot->name, slot->file, combined_buf,

				slot->offset, slot->offset_high, total_len);

	} else {