List:Commits« Previous MessageNext Message »
From:msvensson Date:August 16 2006 1:25pm
Subject:bk commit into 5.0 tree (msvensson:1.2255) BUG#20219
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 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, 2006-08-16 15:25:30+02:00, msvensson@shellback.(none) +1 -0
  Bug#20219  make bin-dist produces unportable for testing tarball
   - Setup LD_LIBRARY_PATH to favor local libs

  mysql-test/mysql-test-run.pl@stripped, 2006-08-16 15:25:27+02:00, msvensson@shellback.(none) +17 -12
    Setup LD_LIBRARY_PATH so the libraries from this distro/clone are
    used in favor of the system installed ones

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/bug20219/my50-bug20219

--- 1.109/mysql-test/mysql-test-run.pl	2006-08-16 15:25:41 +02:00
+++ 1.110/mysql-test/mysql-test-run.pl	2006-08-16 15:25:41 +02:00
@@ -1178,28 +1178,33 @@
 
 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 )
+  {
+    $extra_ld_library_paths= "$glob_basedir/libmysql/.libs/";
+  }
+  else
   {
-    $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/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
Thread
bk commit into 5.0 tree (msvensson:1.2255) BUG#20219msvensson16 Aug