database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools


mysql-test/mysql-test-run.pl:
  Auto merged
This commit is contained in:
unknown
2006-10-06 13:35:00 +02:00
parent ca9faacf9a 7d3887563c
commit 123d9c3141
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/mysql-test-run.pl
View File

@ -1177,7 +1177,9 @@ sub check_mysqld_features () {
if ( !$mysql_version_id ) if ( !$mysql_version_id )
{ {
# Look for version # 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"; #print "Major: $1 Minor: $2 Build: $3\n";
$mysql_version_id= $1*10000 + $2*100 + $3; $mysql_version_id= $1*10000 + $2*100 + $3;