Commit f99bbfc4 authored by unknown's avatar unknown
Browse files

Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
parents 51b59d69 e7d8bde1
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1699,7 +1699,7 @@ sub environment_setup () {
  my $deb_version;
  if (  $opt_valgrind and -d $debug_libraries_path and
        (! -e '/etc/debian_version' or
         ($deb_version= mtr_grab_file('/etc/debian_version')) == 0 or
	 ($deb_version= mtr_grab_file('/etc/debian_version')) !~ /^[0-9]+\.[0-9]$/ or
         $deb_version > 3.1 ) )
  {
    push(@ld_library_paths, $debug_libraries_path);