From 80184739ff67f018b15e2f94f23c75a44fa55740 Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Wed, 4 Oct 2006 23:15:04 +0200
Subject: [PATCH] Look for mysqlslap from 5.1, it's also available on windows

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

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index a2a840208da..b5fdf01ada4 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1307,6 +1307,10 @@ sub executable_setup () {
   $exe_mysqlbinlog=    mtr_exe_exists("$path_client_bindir/mysqlbinlog");
   $exe_mysqladmin=     mtr_exe_exists("$path_client_bindir/mysqladmin");
   $exe_mysql=          mtr_exe_exists("$path_client_bindir/mysql");
+  if ( $mysql_version_id >= 50100 )
+  {
+    $exe_mysqlslap=      mtr_exe_exists("$path_client_bindir/mysqlslap");
+  }
 
   # Look for mysql_fix_system_table script
   $exe_mysql_fix_system_tables=
@@ -1540,21 +1544,18 @@ sub environment_setup () {
   # ----------------------------------------------------
   # Setup env so childs can execute mysqlslap
   # ----------------------------------------------------
-  unless ( $glob_win32 )
-  {
-    my $cmdline_mysqlslap=
-      "$exe_mysqlslap -uroot " .
-      "--port=$master->[0]->{'port'} " .
-      "--socket=$master->[0]->{'path_sock'} --password= " .
-      "--lock-directory=$opt_tmpdir";
+  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;
+  if ( $opt_debug )
+  {
+    $cmdline_mysqlslap .=
+      " --debug=d:t:A,$path_vardir_trace/log/mysqlslap.trace";
   }
+  $ENV{'MYSQL_SLAP'}= $cmdline_mysqlslap;
 
   # ----------------------------------------------------
   # Setup env so childs can execute mysqlimport