From 0d58795f7dd1e2369568eb57130ccd5cd23a8ea6 Mon Sep 17 00:00:00 2001
From: "knielsen@mysql.com" <>
Date: Mon, 2 Jan 2006 14:14:48 +0100
Subject: [PATCH] Fix mysqlslap problems when running multiple tests in
 parallel, by setting the mysqlslap lock directory to value of --tmpdir.

---
 mysql-test/mysql-test-run.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 95968e1511e..60c9686bf0a 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2503,7 +2503,8 @@ sub run_mysqltest ($) {
   {
     $cmdline_mysqlslap= "$exe_mysqlslap -uroot " .
                          "--port=$master->[0]->{'path_myport'} " .
-                         "--socket=$master->[0]->{'path_mysock'} --password=";
+                         "--socket=$master->[0]->{'path_mysock'} --password= " .
+                         "--lock-directory=$opt_tmpdir";
     if ( $opt_debug )
     {
       $cmdline_mysqlslap .=