diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-28 20:00:54 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-28 20:00:54 +0100 |
| commit | e3a9d9493556d159a580d7e266770fcaf38c7343 (patch) | |
| tree | 983e13f7f05c1ec6faabd2d38e8495dbeec27da3 | |
| parent | 90c57042b69b4d438fb8a5bda0da60a01e5a91da (diff) | |
| parent | e8d8ddadac7dafefa1bdcb4aebd65c2f26ca010b (diff) | |
| download | mariadb-git-e3a9d9493556d159a580d7e266770fcaf38c7343.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
mysql-test/mysql-test-run.pl:
Auto merged
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 06a030c6d3a..10b8e84184a 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -676,11 +676,12 @@ sub command_line_setup () { # number as early as possible # - # Look for the client binaries + # Look for the client binaries directory $path_client_bindir= mtr_path_exists("$glob_basedir/client_release", "$glob_basedir/client_debug", vs_config_dirs('client', ''), - "$glob_basedir/client"); + "$glob_basedir/client", + "$glob_basedir/bin/"); $exe_mysqld= mtr_exe_exists (vs_config_dirs('sql', 'mysqld'), "$glob_basedir/sql/mysqld", |