Commit 910eabe2 authored by unknown's avatar unknown
Browse files

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

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
parents 471798a1 123d9c31

mysql-test/mysql-test-run.pl

+3 −1
Original line number Diff line number Diff line
@@ -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;