Commit a3d48fc6 authored by unknown's avatar unknown
Browse files

see notes for Do-compile 


Build-tools/Do-compile:
  Added two options that:
  1. Clear logs on each host prior to build
  2. Turn off ndbcluster
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parent a337dc1d

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ mwagner@work.mysql.com 
mysqldev@build.mysql2.com

nick@mysql.com

nick@nick.leippe.com

patg@krsna.patg.net

paul@central.snake.net

paul@ice.local

paul@ice.snake.net

Build-tools/Do-compile

+5 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ $opt_distribution=$opt_user=$opt_config_env=""; 
$opt_dbd_options=$opt_perl_options=$opt_config_options=$opt_make_options=$opt_suffix="";

$opt_tmp=$opt_version_suffix="";

$opt_help=$opt_delete=$opt_debug=$opt_stage=$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_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=$opt_with_debug=$opt_no_benchmark=$opt_no_mysqltest=$opt_without_embedded=0;

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

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



GetOptions(

	"bdb",
@@ -54,6 +54,8 @@ GetOptions( 
	"with-other-libc=s",

	"with-small-disk",

	"without-embedded",

        "clearlogs",

        "without-ndbcluster",

) || usage();



usage() if ($opt_help);
@@ -138,7 +140,7 @@ $slave_port=$mysql_tcp_port+16; 
$manager_port=$mysql_tcp_port+1;

$mysqladmin_args="--no-defaults -u root --connect_timeout=5 --shutdown_timeout=20";



if ($opt_stage == 0)

if ($opt_stage == 0 || $opt_clearlogs)

{

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

  system("mv $log ${log}-old") if (-f $log);
@@ -234,6 +236,7 @@ if ($opt_stage <= 1) 
  $opt_config_options.= " --with-mysqld-ldflags=-all-static" if ($opt_static_server);

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

  $opt_config_options.= " --with-embedded-server" unless ($opt_without_embedded);

  $opt_config_options.= " --without-ndbcluster" if ($opt_without_ndbcluster);



  # Only enable InnoDB when requested (required to be able to

  # build the "Classic" packages that do not include InnoDB)