summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.blaudden>2007-02-26 14:56:23 +0100
committerunknown <msvensson@pilot.blaudden>2007-02-26 14:56:23 +0100
commitf99bbfc4abd731006c19a0805e4c830a8de6a6f6 (patch)
tree9b0e2a1edcc900fd62cf711f2fa73a680fe19f34 /mysql-test/mysql-test-run.pl
parent51b59d69074212cf8ab3b2f8e3cd49592f7ba088 (diff)
parente7d8bde1da73339e333a4ae5894b121729a865a8 (diff)
downloadmariadb-git-f99bbfc4abd731006c19a0805e4c830a8de6a6f6.tar.gz
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
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 97c86024513..acb101a789e 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -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);