diff options
Diffstat (limited to 'Build-tools/Do-compile')
| -rwxr-xr-x | Build-tools/Do-compile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile index c03ca84c29d..76b94f314c8 100755 --- a/Build-tools/Do-compile +++ b/Build-tools/Do-compile @@ -153,7 +153,7 @@ if ($opt_stage <= 1) { $opt_config_options.= " --with-innodb" } - check_system("$opt_config_env ./configure --prefix=/usr/local/mysql \"--with-comment=Official MySQL$version_suffix binary\" --with-extra-charsets=complex \"--with-server-suffix=$version_suffix\" $opt_config_options","Thank you for choosing MySQL"); + check_system("$opt_config_env ./configure --prefix=/usr/local/mysql \"--with-comment=Official MySQL$version_suffix binary\" --with-extra-charsets=complex \"--with-server-suffix=$version_suffix\" --enable-thread-safe-client $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"); @@ -215,7 +215,7 @@ if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest) { system("mkdir $bench_tmpdir") if (! -d $bench_tmpdir); safe_cd("${test_dir}/mysql-test"); - check_system("./mysql-test-run --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --sleep=10", "tests were successful"); + check_system("./mysql-test-run --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful"); } # Start the server if we are going to run any of the benchmarks @@ -317,7 +317,7 @@ exit 0; sub usage { print <<EOF; -$0 version 1.3 +$0 version 1.4 $0 takes the following options: @@ -549,7 +549,8 @@ sub kill_all chop($cand); ($pid_user, $pid) = split(' ', $cand); next if $pid == $$; - next process if (! ($cand =~ $pattern) || $pid_user ne $user) + next process if (! ($cand =~ $pattern) || $pid_user ne $user); + print LOG "Killing $_\n"; &killpid($pid); } } |