From 05e89c1f439e1b63b9546e0cc62dfec4dd2e1896 Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Mon, 3 Mar 2008 12:53:57 +0100
Subject: [PATCH] Apply patch

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

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index da7185e6c60..23c1bb94819 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -65,6 +65,7 @@ our $basedir;
 
 our $path_charsetsdir;
 our $path_client_bindir;
+our $path_client_libdir;
 our $path_language;
 
 our $path_current_testlog;
@@ -358,6 +359,8 @@ sub command_line_setup {
              'tmpdir=s'                 => \$opt_tmpdir,
              'vardir=s'                 => \$opt_vardir,
              'mem'                      => \$opt_mem,
+             'client-bindir=s'          => \$path_client_bindir,
+             'client-libdir=s'          => \$path_client_libdir,
 
              # Misc
              'report-features'          => \$opt_report_features,
@@ -426,11 +429,19 @@ sub command_line_setup {
   #
 
   # Look for the client binaries directory
-  $path_client_bindir= mtr_path_exists("$basedir/client_release",
-				       "$basedir/client_debug",
-				       vs_config_dirs('client', ''),
-				       "$basedir/client",
-				       "$basedir/bin");
+  if ($path_client_bindir)
+  {
+    # --client-bindir=path set on command line, check that the path exists
+    $path_client_bindir= mtr_path_exists($path_client_bindir);
+  }
+  else
+  {
+    $path_client_bindir= mtr_path_exists("$basedir/client_release",
+					 "$basedir/client_debug",
+					 vs_config_dirs('client', ''),
+					 "$basedir/client",
+					 "$basedir/bin");
+  }
 
   # Look for language files and charsetsdir, use same share
   my $path_share=      mtr_path_exists("$basedir/share/mysql",
@@ -1066,19 +1077,25 @@ sub environment_setup {
 
   my @ld_library_paths;
 
-  # --------------------------------------------------------------------------
-  # Setup LD_LIBRARY_PATH so the libraries from this distro/clone
-  # are used in favor of the system installed ones
-  # --------------------------------------------------------------------------
-  if ( $source_dist )
+  if ($path_client_libdir)
   {
-    push(@ld_library_paths, "$basedir/libmysql/.libs/",
-                            "$basedir/libmysql_r/.libs/",
-                            "$basedir/zlib.libs/");
+    # Use the --client-libdir passed on commandline
+    push(@ld_library_paths, "$path_client_libdir");
   }
   else
   {
-    push(@ld_library_paths, "$basedir/lib");
+    # Setup LD_LIBRARY_PATH so the libraries from this distro/clone
+    # are used in favor of the system installed ones
+    if ( $source_dist )
+    {
+      push(@ld_library_paths, "$basedir/libmysql/.libs/",
+	   "$basedir/libmysql_r/.libs/",
+	   "$basedir/zlib.libs/");
+    }
+    else
+    {
+      push(@ld_library_paths, "$basedir/lib");
+    }
   }
 
   # --------------------------------------------------------------------------
@@ -3614,6 +3631,9 @@ Options to control directories to use
                         for tmpfs (/dev/shm)
                         The option can also be set using environment
                         variable MTR_MEM=[DIR]
+  client-bindir=PATH    Path to the directory where client binaries are located
+  client-libdir=PATH    Path to the directory where client libraries are located
+
 
 Options to control what test suites or cases to run