Commit 00a549a5 authored by unknown's avatar unknown
Browse files

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

into mdk10.(none):/home/reggie/bk/mysql-4.1
parents 5b3549e6 11b64a4e

Build-tools/Bootstrap

+28 −14
Original line number Diff line number Diff line
@@ -240,40 +240,52 @@ if (defined $opt_changelog) 
	# the last tagged ChangeSet (this relies heavily on our current tagging

	# practice!)

	#

	my $revision= "";

	$opt_changelog=~ s/^=//;	# Sometimes, a leading '=' was not stripped.

	my $log_base= $opt_changelog;

	my $changelogfile;

	if ($target_dir =~ m:^/:)	# we need an absolute path, as we change directory

	{

		$changelogfile= $target_dir. "/ChangeLog";

	}

	else

	{

		$changelogfile= cwd() . "/" . $target_dir . "/ChangeLog";

	}



	if ($opt_changelog eq "last")

	{

		if (!$opt_revision)

		{

			$revision= `bk changes -t -d':REV:::TAG:' -n $REPO | grep mysql-$major.$minor | head -1 | cut -f1 -d ":"`;

			$log_base= `bk changes -t -d':REV:::TAG:' -n $REPO | grep mysql-$major.$minor | head -1 | cut -f1 -d ":"`;

		}

		else

		{

			$revision= `bk changes -r..$opt_revision -t -d':REV:' -n $REPO | head -2 | tail -1`;

			$log_base= `bk changes -r..$opt_revision -t -d':REV:' -n $REPO | head -2 | tail -1`;

		}

		chomp($revision);

		$opt_changelog= $revision;

		chomp($log_base);

	}



	$msg= "Adding $target_dir/ChangeLog";

	$msg.= " (down to revision $opt_changelog)" if $opt_changelog ne "";

	$msg= "Adding $changelogfile";

	$msg.= " (down to revision $log_base)" if $log_base ne "";

	&logger($msg);

	$command= "bk changes -v";

	$command.= " -r" if ($opt_changelog ne "" || $opt_revision);

	$command.= $opt_changelog if $opt_changelog ne "";

	$command.= ".." if ($opt_changelog ne "" && !$opt_revision);

	# Due to a BK error, "bk changes" must be run in $REPO !

	$command= "cd $REPO ; ";

	$command.= "bk changes -v";

	$command.= " -r" if ($log_base ne "" || $opt_revision);

	$command.= $log_base if $log_base ne "";

	$command.= ".." if ($log_base ne "" && !$opt_revision);

	$command.= ".." . $opt_revision if $opt_revision;

	$command.= " " . $REPO . " > $target_dir/ChangeLog";

	$command.= " > $changelogfile";

	&logger($command);

	# We cannot use run_command here because of output redirection

	unless ($opt_dry_run)

	{

		system($command) == 0 or &abort("Could not create $target_dir/ChangeLog!");

		system($command) == 0 or &abort("Could not create $changelogfile!");

	}

}



#

# Add the latest manual from the mysqldoc tree

# Add the latest manual and tool from the mysqldoc tree

#

unless ($opt_skip_manual)

{
@@ -283,6 +295,8 @@ unless ($opt_skip_manual) 
		system ("bk cat $opt_docdir/Docs/$file.texi > $target_dir/Docs/$file.texi") == 0

		or &abort("Could not update $file.texi in $target_dir/Docs/!");

	}

	&run_command("cp $opt_docdir/Docs/Support/texi2html $target_dir/Docs/Support",

	  "Could not copy $opt_docdir/Docs/Support/texi2html!");



	&run_command("rm -f $target_dir/Docs/Images/Makefile*",

 	  "Could not remove Makefiles in $target_dir/Docs/Images/!");

Build-tools/Do-compile

+6 −2
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ use Sys::Hostname; 
$opt_comment=$opt_distribution=$opt_user=$opt_config_env=$opt_config_extra_env="";

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

$opt_tmp=$opt_version_suffix="";

$opt_bundled_zlib=$opt_help=$opt_delete=$opt_debug=$opt_stage=$opt_no_test=$opt_no_perl=$opt_one_error=$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_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=$opt_with_archive=$opt_with_cluster=$opt_with_csv=$opt_with_example=$opt_with_debug=$opt_no_benchmark=$opt_no_mysqltest=$opt_without_embedded=$opt_readline=0;

$opt_skip_embedded_test=$opt_skip_ps_test=$opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=$opt_clearlogs=0;

$opt_bundled_zlib=$opt_help=$opt_delete=$opt_debug=$opt_stage=$opt_no_test=$opt_no_perl=$opt_one_error=$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_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=$opt_with_archive=$opt_with_cluster=$opt_with_csv=$opt_with_example=$opt_with_debug=$opt_no_benchmark=$opt_no_mysqltest=$opt_without_embedded=$opt_readline=$opt_with_blackhole=0;

$opt_skip_embedded_test=$opt_skip_ps_test=$opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=$opt_clearlogs=$opt_with_big_tables=0;

$global_step="";



GetOptions(
@@ -58,6 +58,8 @@ GetOptions( 
	"user=s",

	"version-suffix=s",

	"with-archive",

        "with-big-tables",

        "with-blackhole",

	"with-cluster",

	"with-csv",

	"with-example",
@@ -274,6 +276,7 @@ if ($opt_stage <= 1) 
  $opt_config_options.= " --without-ndb-debug" if ($opt_with_debug && $opt_with_cluster);

  $opt_config_options.= " --with-libwrap" if ($opt_libwrap);

  $opt_config_options.= " --with-low-memory" if ($opt_with_low_memory);

  $opt_config_options.= " --with-big-tables" if ($opt_with_big_tables);

  $opt_config_options.= " --with-mysqld-ldflags=-all-static" if ($opt_static_server);

  $opt_config_options.= " --with-raid" if ($opt_raid);

	if ($opt_readline)
@@ -287,6 +290,7 @@ if ($opt_stage <= 1) 
  $opt_config_options.= " --with-embedded-server" unless ($opt_without_embedded);

  $opt_skip_embedded_test= 1 if ($opt_without_embedded);

  $opt_config_options.= " --with-archive-storage-engine" if ($opt_with_archive);

  $opt_config_options.= " --with-blackhole-storage-engine" if ($opt_with_blackhole);

  $opt_config_options.= " --with-ndbcluster" if ($opt_with_cluster);

  $opt_config_options.= " --with-csv-storage-engine" if ($opt_with_csv);

  $opt_config_options.= " --with-example-storage-engine" if ($opt_with_example);

acinclude.m4

+28 −0
Original line number Diff line number Diff line
@@ -1067,6 +1067,34 @@ AC_MSG_CHECKING(for OpenSSL) 
])





dnl ---------------------------------------------------------------------------

dnl Macro: MYSQL_CHECK_BIG_TABLES

dnl Sets BIG_TABLES if --with-big-tables is used

dnl ---------------------------------------------------------------------------

AC_DEFUN([MYSQL_CHECK_BIG_TABLES], [

  AC_ARG_WITH([big-tables],

              [

  --with-big-tables       Support tables with more than 4 G rows even on 32 bit platforms],

              [bigtables="$withval"],

              [bigtables=no])

  AC_MSG_CHECKING([for big tables support])



  case "$bigtables" in

    yes )

      AC_DEFINE([BIG_TABLES], [1], [Support big tables])

      AC_MSG_RESULT([yes])

      ;;

    * )

      AC_MSG_RESULT([no])

      ;;

  esac



])

dnl ---------------------------------------------------------------------------

dnl END OF MYSQL_CHECK_BIG_TABLES SECTION

dnl ---------------------------------------------------------------------------





AC_DEFUN([MYSQL_CHECK_MYSQLFS], [

  AC_ARG_WITH([mysqlfs],

              [

configure.in

+1 −0
Original line number Diff line number Diff line
@@ -2835,6 +2835,7 @@ else 
  AC_MSG_RESULT(no)

fi



MYSQL_CHECK_BIG_TABLES

MYSQL_CHECK_ISAM

MYSQL_CHECK_BDB

MYSQL_CHECK_INNODB

include/violite.h

+2 −2
Original line number Diff line number Diff line
@@ -138,8 +138,8 @@ int vio_close_shared_memory(Vio * vio); 
#if defined(HAVE_VIO) && !defined(DONT_MAP_VIO)

#define vio_delete(vio) 			(vio)->viodelete(vio)

#define vio_errno(vio)	 			(vio)->vioerrno(vio)

#define vio_read(vio, buf, size) 		(vio)->read(vio,buf,size)

#define vio_write(vio, buf, size) 		(vio)->write(vio, buf, size)

#define vio_read(vio, buf, size)                ((vio)->read)(vio,buf,size)

#define vio_write(vio, buf, size)               ((vio)->write)(vio, buf, size)

#define vio_blocking(vio, set_blocking_mode, old_mode)\

 	(vio)->vioblocking(vio, set_blocking_mode, old_mode)

#define vio_is_blocking(vio) 			(vio)->is_blocking(vio)