diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-11-11 09:30:58 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-11-11 09:30:58 +0100 |
| commit | e780bd9efa6e82093ccd6e500bf592fc3c684cef (patch) | |
| tree | 85b4e2958f3435cf55e9f5a035a5c7c892416802 /mysql-test/mysql-test-run.pl | |
| parent | db635ab590704232308ac1aa5629a1d940de9f16 (diff) | |
| download | mariadb-git-e780bd9efa6e82093ccd6e500bf592fc3c684cef.tar.gz | |
MDEV-4977 ./mysql-test/mysql-test-run.pl not identifying mariadb version
quote the path when using it in a regex - the path might contain wildcards (e.g. +)
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index d7e33a1b72c..27088df0a81 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1890,7 +1890,7 @@ sub collect_mysqld_features { my @list= split '\n', $list; mtr_error("Could not find version of MariaDB") - unless shift(@list) =~ /^$exe_mysqld\s+Ver\s(\d+)\.(\d+)\.(\d+)(\S*)/; + unless shift(@list) =~ /^\Q$exe_mysqld\E\s+Ver\s(\d+)\.(\d+)\.(\d+)(\S*)/; $mysql_version_id= $1*10000 + $2*100 + $3; $mysql_version_extra= $4; mtr_report("MariaDB Version $1.$2.$3$4"); |