Commit 7d388756 authored by unknown's avatar unknown

Modify regex for parsing mysqld version as the mysqld is sometimes a libtool wrapper and

the "mysqld --version" command will print "/path/.libs/lt-mysqld  Ver x.x.x"


mysql-test/mysql-test-run.pl:
  Modify regex for parsing mysqld version as the mysqld is sometimes a libtool wrapper and
  the "mysqld --version" command will print "/path/.libs/lt-mysqld"
parent 81d42333
...@@ -1177,7 +1177,9 @@ sub check_mysqld_features () { ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment