bk commit into 5.1 tree (msvensson:1.2553)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson.  When msvensson does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-03 12:53:57+01:00, msvensson@stripped +1 -0
  Apply patch

  mysql-test/mysql-test-run.pl@stripped, 2008-03-03 12:53:55+01:00, msvensson@stripped
+34 -14
    Apply patch for bug#34995

diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2008-03-03 10:03:02 +01:00
+++ b/mysql-test/mysql-test-run.pl	2008-03-03 12:53:55 +01:00
@@ -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