diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-10-06 13:35:00 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-10-06 13:35:00 +0200 |
| commit | 123d9c3141d9ad04ba35bddd35bc5777114b718a (patch) | |
| tree | c830ff0a81d0241eb1b6ca693e746453f3c683e8 | |
| parent | ca9faacf9a1615b7ab8be01521c3cbd96575e5f1 (diff) | |
| parent | 7d3887563c6a5ced3b7898474ee9804d902e8f5b (diff) | |
| download | mariadb-git-123d9c3141d9ad04ba35bddd35bc5777114b718a.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
mysql-test/mysql-test-run.pl:
Auto merged
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 2226c62a262..4eef16e0388 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1177,7 +1177,9 @@ sub check_mysqld_features () { if ( !$mysql_version_id ) { # Look for version - if ( $line =~ /^$exe_mysqld\s\sVer\s([0-9]*)\.([0-9]*)\.([0-9]*)/ ) + my $exe_name= basename($exe_mysqld); + mtr_verbose("exe_name: $exe_name"); + if ( $line =~ /^\S*$exe_name\s\sVer\s([0-9]*)\.([0-9]*)\.([0-9]*)/ ) { #print "Major: $1 Minor: $2 Build: $3\n"; $mysql_version_id= $1*10000 + $2*100 + $3; |