From 7d3887563c6a5ced3b7898474ee9804d902e8f5b Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 6 Oct 2006 13:33:12 +0200 Subject: [PATCH] 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" --- mysql-test/mysql-test-run.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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;