Commit 86ac1d94 authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/bug20219/my50-bug20219 

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
parents f4e98df3 f5358d90

mysql-test/mysql-test-run.pl

+17 −12
Original line number Diff line number Diff line
@@ -1178,28 +1178,33 @@ sub executable_setup () { 


sub environment_setup () {



  my $extra_ld_library_paths;



  # --------------------------------------------------------------------------

  # We might not use a standard installation directory, like /usr/lib.

  # Set LD_LIBRARY_PATH to make sure we find our installed libraries.

  # Setup LD_LIBRARY_PATH so the libraries from this distro/clone

  # are used in favor of the system installed ones

  # --------------------------------------------------------------------------



  unless ( $opt_source_dist )

  if ( $opt_source_dist )

  {

    $ENV{'LD_LIBRARY_PATH'}=

      "$glob_basedir/lib" .

        ($ENV{'LD_LIBRARY_PATH'} ? ":$ENV{'LD_LIBRARY_PATH'}" : "");

    $ENV{'DYLD_LIBRARY_PATH'}=

      "$glob_basedir/lib" .

        ($ENV{'DYLD_LIBRARY_PATH'} ? ":$ENV{'DYLD_LIBRARY_PATH'}" : "");

    $extra_ld_library_paths= "$glob_basedir/libmysql/.libs/";

  }

  else

  {

    $extra_ld_library_paths= "$glob_basedir/lib";

  }



  # --------------------------------------------------------------------------

  # Add the path where mysqld will find udf_example.so

  # --------------------------------------------------------------------------

  $extra_ld_library_paths .= ":" .

    ($lib_udf_example ?  dirname($lib_udf_example) : "");



  $ENV{'LD_LIBRARY_PATH'}=

    ($lib_udf_example ?  dirname($lib_udf_example) : "") .

    "$extra_ld_library_paths" .

      ($ENV{'LD_LIBRARY_PATH'} ? ":$ENV{'LD_LIBRARY_PATH'}" : "");



  $ENV{'DYLD_LIBRARY_PATH'}=

    "$extra_ld_library_paths" .

      ($ENV{'DYLD_LIBRARY_PATH'} ? ":$ENV{'DYLD_LIBRARY_PATH'}" : "");



  # --------------------------------------------------------------------------

  # Also command lines in .opt files may contain env vars