diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-01-05 18:04:14 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-01-05 18:04:14 +0200 |
| commit | 374f49b2629114a9473268da4321af405a9d2394 (patch) | |
| tree | 89e35216066bc03acde37404609a61846ffd4f62 /mysql-test | |
| parent | 4978004e8d8eff8d4d9e93e11458b9e131c26456 (diff) | |
| parent | 2860ef084afc17c3f53bb03f1a7386738950413c (diff) | |
| download | mariadb-git-374f49b2629114a9473268da4321af405a9d2394.tar.gz | |
merge 5.0 -> 5.0-bugteam
Diffstat (limited to 'mysql-test')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 70637034b6e..0948c973e9b 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1508,15 +1508,21 @@ sub executable_setup_ndb () { "$glob_basedir/storage/ndb", "$glob_basedir/bin"); + # Some might be found in sbin, not bin. + my $daemon_path= mtr_file_exists("$glob_basedir/ndb", + "$glob_basedir/storage/ndb", + "$glob_basedir/sbin", + "$glob_basedir/bin"); + $exe_ndbd= mtr_exe_maybe_exists("$ndb_path/src/kernel/ndbd", - "$ndb_path/ndbd"); + "$daemon_path/ndbd"); $exe_ndb_mgm= mtr_exe_maybe_exists("$ndb_path/src/mgmclient/ndb_mgm", "$ndb_path/ndb_mgm"); $exe_ndb_mgmd= mtr_exe_maybe_exists("$ndb_path/src/mgmsrv/ndb_mgmd", - "$ndb_path/ndb_mgmd"); + "$daemon_path/ndb_mgmd"); $exe_ndb_waiter= mtr_exe_maybe_exists("$ndb_path/tools/ndb_waiter", "$ndb_path/ndb_waiter"); |