diff options
| author | unknown <msvensson@shellback.(none)> | 2006-10-13 20:29:27 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-10-13 20:29:27 +0200 |
| commit | 00e327ed88a9cecd683a3fa3ec393b6be9f43854 (patch) | |
| tree | f6fa747b0b61f81b6ef624b4a72cf02c63c4e961 /mysql-test/mysql-test-run.pl | |
| parent | 7e73af6342bd436fc505084f868ec19378b79d5c (diff) | |
| download | mariadb-git-00e327ed88a9cecd683a3fa3ec393b6be9f43854.tar.gz | |
Look for client bindirs client_release and client_debug before other directories.
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 24cdedce712..3cc0110ed05 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -468,11 +468,11 @@ sub initial_setup () { # # Look for the path where to find the client binaries - $path_client_bindir= mtr_path_exists("$glob_basedir/client/release", + $path_client_bindir= mtr_path_exists("$glob_basedir/client_release", + "$glob_basedir/client_debug", + "$glob_basedir/client/release", "$glob_basedir/client/debug", "$glob_basedir/client", - "$glob_basedir/client_release", - "$glob_basedir/client_debug", "$glob_basedir/bin"); # Look for the mysqld executable @@ -484,6 +484,7 @@ sub initial_setup () { "$path_client_bindir/mysqld-debug", "$path_client_bindir/mysqld-max", "$glob_basedir/libexec/mysqld", + "$glob_basedir/bin/mysqld", "$glob_basedir/sql/release/mysqld", "$glob_basedir/sql/debug/mysqld"); |