Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1

into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
parents 92631046 47d6296b
...@@ -1299,10 +1299,8 @@ sub executable_setup () { ...@@ -1299,10 +1299,8 @@ sub executable_setup () {
$path_ndb_tools_dir= "$glob_basedir/bin"; $path_ndb_tools_dir= "$glob_basedir/bin";
$exe_ndb_mgm= "$glob_basedir/bin/ndb_mgm"; $exe_ndb_mgm= "$glob_basedir/bin/ndb_mgm";
$exe_ndb_waiter= "$glob_basedir/bin/ndb_waiter"; $exe_ndb_waiter= "$glob_basedir/bin/ndb_waiter";
$exe_ndbd= mtr_exe_exists("$glob_basedir/libexec/ndbd", $exe_ndbd= "$glob_basedir/bin/ndbd";
"$glob_basedir/bin/ndbd"); $exe_ndb_mgmd= "$glob_basedir/bin/ndb_mgmd";
$exe_ndb_mgmd= mtr_exe_exists("$glob_basedir/libexec/ndb_mgmd",
"$glob_basedir/bin/ndb_mgmd");
} }
$exe_master_mysqld= $exe_master_mysqld || $exe_mysqld; $exe_master_mysqld= $exe_master_mysqld || $exe_mysqld;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment