Commit 395a1648 authored by unknown's avatar unknown

Only setup cmdline_myslslap if exe_mysqlslap defined

parent 693465a6
...@@ -1544,18 +1544,21 @@ sub environment_setup () { ...@@ -1544,18 +1544,21 @@ sub environment_setup () {
# ---------------------------------------------------- # ----------------------------------------------------
# Setup env so childs can execute mysqlslap # Setup env so childs can execute mysqlslap
# ---------------------------------------------------- # ----------------------------------------------------
my $cmdline_mysqlslap= if ( $exe_mysqlslap )
"$exe_mysqlslap -uroot " .
"--port=$master->[0]->{'port'} " .
"--socket=$master->[0]->{'path_sock'} --password= " .
"--lock-directory=$opt_tmpdir";
if ( $opt_debug )
{ {
$cmdline_mysqlslap .= my $cmdline_mysqlslap=
" --debug=d:t:A,$path_vardir_trace/log/mysqlslap.trace"; "$exe_mysqlslap -uroot " .
"--port=$master->[0]->{'port'} " .
"--socket=$master->[0]->{'path_sock'} --password= " .
"--lock-directory=$opt_tmpdir";
if ( $opt_debug )
{
$cmdline_mysqlslap .=
" --debug=d:t:A,$path_vardir_trace/log/mysqlslap.trace";
}
$ENV{'MYSQL_SLAP'}= $cmdline_mysqlslap;
} }
$ENV{'MYSQL_SLAP'}= $cmdline_mysqlslap;
# ---------------------------------------------------- # ----------------------------------------------------
# Setup env so childs can execute mysqlimport # Setup env so childs can execute mysqlimport
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment