From 395a16482d16e7b54d7b2f55fe8dc286186a51c0 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Wed, 4 Oct 2006 23:19:06 +0200
Subject: [PATCH] Only setup cmdline_myslslap if exe_mysqlslap defined

---
 mysql-test/mysql-test-run.pl | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index b5fdf01ada4..7f2b61efb4c 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1544,18 +1544,21 @@ sub environment_setup () {
   # ----------------------------------------------------
   # Setup env so childs can execute mysqlslap
   # ----------------------------------------------------
-  my $cmdline_mysqlslap=
-    "$exe_mysqlslap -uroot " .
-    "--port=$master->[0]->{'port'} " .
-    "--socket=$master->[0]->{'path_sock'} --password= " .
-    "--lock-directory=$opt_tmpdir";
-
-  if ( $opt_debug )
+  if ( $exe_mysqlslap )
   {
-    $cmdline_mysqlslap .=
-      " --debug=d:t:A,$path_vardir_trace/log/mysqlslap.trace";
+    my $cmdline_mysqlslap=
+      "$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