diff options
| author | unknown <joerg@trift2.> | 2006-08-18 18:24:38 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2006-08-18 18:24:38 +0200 |
| commit | bc4215111ca83b8535915c8b8d207fe105b4cb66 (patch) | |
| tree | 3994d50722c279cf41a4b01d55f7a0a9a0c507f2 /mysql-test | |
| parent | 55fb3caeecd1a7686789a2f847039cbd7dfb355e (diff) | |
| download | mariadb-git-bc4215111ca83b8535915c8b8d207fe105b4cb66.tar.gz | |
mysql-test-run.pl : Fix the search path for "ndb_mgmd" and "ndbd". bug#21721
mysql-test/mysql-test-run.pl:
In 5.1 packages, the binaries "ndbd" and "ndb_mgmd" are in subdirectory "bin", not in "libexec".
Use the search function "mtr_exe_exists()", in case there might be exceptions.
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; |