Skip to content

M
mariadb
Commit 56ccee0f authored by msvensson@neptunus.(none)'s avatar msvensson@neptunus.(none)
Browse files
Options

Only setup cmdline_myslslap if exe_mysqlslap defined

parent 80184739
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 10 deletions
mysql-test/mysql-test-run.pl
View file @ 56ccee0f
...@@ -1544,6 +1544,8 @@ sub environment_setup () { ...@@ -1544,6 +1544,8 @@ sub environment_setup () {
# ---------------------------------------------------- # ----------------------------------------------------
# Setup env so childs can execute mysqlslap # Setup env so childs can execute mysqlslap
# ---------------------------------------------------- # ----------------------------------------------------
if ( $exe_mysqlslap )
{
my $cmdline_mysqlslap= my $cmdline_mysqlslap=
"$exe_mysqlslap -uroot " . "$exe_mysqlslap -uroot " .
"--port=$master->[0]->{'port'} " . "--port=$master->[0]->{'port'} " .
...@@ -1556,6 +1558,7 @@ sub environment_setup () { ...@@ -1556,6 +1558,7 @@ sub environment_setup () {
" --debug=d:t:A,$path_vardir_trace/log/mysqlslap.trace"; " --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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7