auto merge

mysql-test/mysql-test-run.pl

@@ -110,6 +110,7 @@ our $glob_basedir;
 
 our $path_charsetsdir;
 our $path_client_bindir;
+our $path_client_libdir;
 our $path_language;
 our $path_timefile;
 our $path_snapshot;
@@ -623,6 +624,8 @@ sub command_line_setup () {
              'vardir=s'                 => \$opt_vardir,
              'benchdir=s'               => \$glob_mysql_bench_dir,
              'mem'                      => \$opt_mem,
+             'client-bindir=s'          => \$path_client_bindir,
+             'client-libdir=s'          => \$path_client_libdir,
 
              # Misc
              'report-features'          => \$opt_report_features,
@@ -717,11 +720,19 @@ sub command_line_setup () {
   #
 
   # Look for the client binaries directory
+  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("$glob_basedir/client_release",
 					 "$glob_basedir/client_debug",
 					 vs_config_dirs('client', ''),
 					 "$glob_basedir/client",
 					 "$glob_basedir/bin");
+  }
 
   if (!$opt_extern)
   {
@@ -1764,10 +1775,15 @@ sub environment_setup () {
 
   my @ld_library_paths;
 
-  # --------------------------------------------------------------------------
+  if ($path_client_libdir)
+  {
+    # Use the --client-libdir passed on commandline
+    push(@ld_library_paths, "$path_client_libdir");
+  }
+  else
+  {
     # 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, "$glob_basedir/libmysql/.libs/",
@@ -1778,6 +1794,7 @@ sub environment_setup () {
     {
       push(@ld_library_paths, "$glob_basedir/lib");
     }
+  }
 
  # --------------------------------------------------------------------------
   # Add the path where libndbclient can be found
@@ -2028,6 +2045,9 @@ sub environment_setup () {
   {
     $cmdline_mysqlbinlog .=" --character-sets-dir=$path_charsetsdir";
   }
+  # Always use the given tmpdir for the LOAD files created
+  # by mysqlbinlog
+  $cmdline_mysqlbinlog .=" --local-load=$opt_tmpdir";
 
   if ( $opt_debug )
   {
@@ -5244,6 +5264,8 @@ Misc options
   warnings | log-warnings Pass --log-warnings to mysqld
 
   sleep=SECONDS         Passed to mysqltest, will be used as fixed sleep time
+  client-bindir=PATH    Path to the directory where client binaries are located
+  client-libdir=PATH    Path to the directory where client libraries are located
 
 Deprecated options
   with-openssl          Deprecated option for ssl