← Back to branch summary

~danielpvolpato/mysql-server/parallel-mysqldump

« back to all changes in this revision

Viewing changes to mysql-test/mysql-test-run.pl

Merge from main 5.1 to 5.1-build

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysql-test/mysql-test-run.pl
112
112
 
113
113
our $path_charsetsdir;
114
114
our $path_client_bindir;
 
115
our $path_client_libdir;
115
116
our $path_share;
116
117
our $path_language;
117
118
our $path_timefile;
657
658
             'vardir=s'                 => \$opt_vardir,
658
659
             'benchdir=s'               => \$glob_mysql_bench_dir,
659
660
             'mem'                      => \$opt_mem,
 
661
             'client-bindir=s'          => \$path_client_bindir,
 
662
             'client-libdir=s'          => \$path_client_libdir,
660
663
 
661
664
             # Misc
662
665
             'report-features'          => \$opt_report_features,
783
786
  #
784
787
 
785
788
  # Look for the client binaries directory
786
 
  $path_client_bindir= mtr_path_exists("$glob_basedir/client_release",
787
 
                                       "$glob_basedir/client_debug",
788
 
                                       vs_config_dirs('client', ''),
789
 
                                       "$glob_basedir/client",
790
 
                                       "$glob_basedir/bin");
791
 
 
 
789
  if ($path_client_bindir)
 
790
  {
 
791
    # --client-bindir=path set on command line, check that the path exists
 
792
    $path_client_bindir= mtr_path_exists($path_client_bindir);
 
793
  }
 
794
  else
 
795
  {
 
796
    $path_client_bindir= mtr_path_exists("$glob_basedir/client_release",
 
797
                                         "$glob_basedir/client_debug",
 
798
                                         vs_config_dirs('client', ''),
 
799
                                         "$glob_basedir/client",
 
800
                                         "$glob_basedir/bin");
 
801
  }
 
802
  
792
803
  # Look for language files and charsetsdir, use same share
793
804
  $path_share=      mtr_path_exists("$glob_basedir/share/mysql",
794
805
                                    "$glob_basedir/sql/share",
1837
1848
 
1838
1849
  my @ld_library_paths;
1839
1850
 
1840
 
  # --------------------------------------------------------------------------
1841
 
  # Setup LD_LIBRARY_PATH so the libraries from this distro/clone
1842
 
  # are used in favor of the system installed ones
1843
 
  # --------------------------------------------------------------------------
1844
 
  if ( $source_dist )
 
1851
  if ($path_client_libdir)
1845
1852
  {
1846
 
    push(@ld_library_paths, "$glob_basedir/libmysql/.libs/",
1847
 
                            "$glob_basedir/libmysql_r/.libs/",
1848
 
                            "$glob_basedir/zlib.libs/");
 
1853
    # Use the --client-libdir passed on commandline
 
1854
    push(@ld_library_paths, "$path_client_libdir");
1849
1855
  }
1850
1856
  else
1851
1857
  {
1852
 
    push(@ld_library_paths, "$glob_basedir/lib");
 
1858
    # Setup LD_LIBRARY_PATH so the libraries from this distro/clone
 
1859
    # are used in favor of the system installed ones
 
1860
    if ( $source_dist )
 
1861
    {
 
1862
      push(@ld_library_paths, "$glob_basedir/libmysql/.libs/",
 
1863
           "$glob_basedir/libmysql_r/.libs/",
 
1864
           "$glob_basedir/zlib.libs/");
 
1865
    }
 
1866
    else
 
1867
    {
 
1868
      push(@ld_library_paths, "$glob_basedir/lib");
 
1869
    }
1853
1870
  }
1854
1871
 
1855
1872
 # --------------------------------------------------------------------------
2091
2108
  {
2092
2109
    $cmdline_mysqlbinlog .=" --character-sets-dir=$path_charsetsdir";
2093
2110
  }
 
2111
  # Always use the given tmpdir for the LOAD files created
 
2112
  # by mysqlbinlog
 
2113
  $cmdline_mysqlbinlog .=" --local-load=$opt_tmpdir";
2094
2114
 
2095
2115
  if ( $opt_debug )
2096
2116
  {
5357
5377
  warnings | log-warnings Pass --log-warnings to mysqld
5358
5378
 
5359
5379
  sleep=SECONDS         Passed to mysqltest, will be used as fixed sleep time
 
5380
  client-bindir=PATH    Path to the directory where client binaries are located
 
5381
  client-libdir=PATH    Path to the directory where client libraries are located
5360
5382
 
5361
5383
Deprecated options
5362
5384
  with-openssl          Deprecated option for ssl