Commit a806cba3 authored by unknown's avatar unknown
Browse files

Merge from 4.0 for immediate use in the current 5.0 builds. 


client/mysqladmin.cc:
  Auto merged
Build-tools/Do-compile:
  Merged the default "--force" for the call to 'mysql-test-run' from 4.0, for immediate use in the current 5.0 builds.
parents 3392e317 55ea7c8b

Build-tools/Do-compile

+9 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ use Sys::Hostname; 
$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_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_cluster=$opt_with_debug=$opt_no_benchmark=$opt_no_mysqltest=$opt_without_embedded=$opt_readline=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_cluster=$opt_with_debug=$opt_no_benchmark=$opt_no_mysqltest=$opt_without_embedded=$opt_readline=0;

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



GetOptions(
@@ -37,6 +37,7 @@ GetOptions( 
	"no-test",

	"no-mysqltest",

	"no-benchmark",

	"one-error",

	"perl-files=s",

	"perl-options=s",

	"raid",
@@ -310,6 +311,7 @@ if ($opt_stage <= 2) 
  $command=$make;

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

  safe_system($command);

  print LOG "Do-compile: Build successful\n";

}



#
@@ -373,10 +375,12 @@ if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest) 
{

  my $flags= "";

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

  $flags.= " --force" if (!$opt_one_error);

  log_timestamp();

  system("mkdir $bench_tmpdir") if (! -d $bench_tmpdir);

  safe_cd("${test_dir}/mysql-test");

  check_system("./mysql-test-run $flags --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");

  # 'mysql-test-run' writes its own final message for log evaluation.

}



#
@@ -555,7 +559,10 @@ Do not run any tests. 
Do not run the benchmark test (written in perl)



--no-mysqltest

Do not run the the mysql-test-run test (Same as 'make test')

Do not run the mysql-test-run test (Same as 'make test')



--one-error

Terminate the mysql-test-run test after the first difference (default: use '--force')



--no-perl

Do not compile or install Perl modules, use the system installed ones

client/mysqladmin.cc

+1 −1
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) 
      {

	char *pos,buff[40];

	ulong sec;

	pos=strchr(status,' ');

	pos= (char*) strchr(status,' ');

	*pos++=0;

	printf("%s\t\t\t",status);			/* print label */

	if ((status=str2int(pos,10,0,LONG_MAX,(long*) &sec)))