diff options
Diffstat (limited to 'mysql-test')
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 0d8739a4613..bcd03a2f0ff 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1299,8 +1299,10 @@ sub executable_setup () { $path_ndb_tools_dir= "$glob_basedir/bin"; $exe_ndb_mgm= "$glob_basedir/bin/ndb_mgm"; $exe_ndb_waiter= "$glob_basedir/bin/ndb_waiter"; - $exe_ndbd= "$glob_basedir/libexec/ndbd"; - $exe_ndb_mgmd= "$glob_basedir/libexec/ndb_mgmd"; + $exe_ndbd= mtr_exe_exists("$glob_basedir/libexec/ndbd", + "$glob_basedir/bin/ndbd"); + $exe_ndb_mgmd= mtr_exe_exists("$glob_basedir/libexec/ndb_mgmd", + "$glob_basedir/bin/ndb_mgmd"); } $exe_master_mysqld= $exe_master_mysqld || $exe_mysqld; |