diff options
author | unknown <rburnett@bk-internal.mysql.com> | 2006-08-21 20:27:32 +0200 |
---|---|---|
committer | unknown <rburnett@bk-internal.mysql.com> | 2006-08-21 20:27:32 +0200 |
commit | bfaef559c0ec546fa855e6e4c38616e4321efba4 (patch) | |
tree | 1eb9311d03a6bec26f5b0328175e8d81d9c444ea /mysql-test | |
parent | c75d6dbd9b2a7f459619dbc654c1163287d63bdf (diff) | |
parent | 524914b2170927aa0b1d95b63d229ac0e11fc092 (diff) | |
download | mariadb-git-bfaef559c0ec546fa855e6e4c38616e4321efba4.tar.gz |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
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; |