diff options
author | unknown <msvensson@pilot.blaudden> | 2007-02-28 10:07:37 +0100 |
---|---|---|
committer | unknown <msvensson@pilot.blaudden> | 2007-02-28 10:07:37 +0100 |
commit | 79d1fc5de6e56b779313c2cea7f4788080aafc45 (patch) | |
tree | 448f60bfd5d010a31e067a141b984c993cdfbd74 /mysql-test/mysql-test-run.pl | |
parent | 4780c88ff08411203db419e01c738ee5a74ec25e (diff) | |
parent | aff6a36ecf87e324b82470ebf2dfaf2edf471ff6 (diff) | |
download | mariadb-git-79d1fc5de6e56b779313c2cea7f4788080aafc45.tar.gz |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 44c7c6b83ca..4f1269cb351 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1713,7 +1713,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); |