diff options
| author | unknown <joerg@trift2.> | 2006-08-21 16:19:29 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2006-08-21 16:19:29 +0200 |
| commit | 524914b2170927aa0b1d95b63d229ac0e11fc092 (patch) | |
| tree | 4535338207746d2bcbe88646553aeda41e1f84aa /mysql-test | |
| parent | 2d76647976db2aaf1a252ab2ac4274dab22866f8 (diff) | |
| download | mariadb-git-524914b2170927aa0b1d95b63d229ac0e11fc092.tar.gz | |
mysql-test/mysql-test-run.pl : Use fixed path names for all NDB binaries,
because searching for them makes the script abort with all non-NDB builds.
mysql-test/mysql-test-run.pl:
Checking with "mtr_exe_exists()" for the location of a binary will yield an error
if the binary is found nowhere at all, and this happens with NDB binaries in all
builds that do not contain NDB; so the correct way is fixed path names only.
Still part of the fix for the #21721 bug.
Diffstat (limited to 'mysql-test')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index bcd03a2f0ff..7d5a3af46a6 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1299,10 +1299,8 @@ 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= 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_ndbd= "$glob_basedir/bin/ndbd"; + $exe_ndb_mgmd= "$glob_basedir/bin/ndb_mgmd"; } $exe_master_mysqld= $exe_master_mysqld || $exe_mysqld; |