mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Bug#58159 mtr.pl can't run out of source build with NDB
- use $bindir instead of $basedir when looking for binaries - NOTE! the $ENV{NDB_EXAMPLES_*} will be reworked so that mtr.pl does not need to set them up.
This commit is contained in:
@@ -1752,17 +1752,17 @@ sub executable_setup () {
|
||||
if ( ! $opt_skip_ndbcluster )
|
||||
{
|
||||
$exe_ndbd=
|
||||
my_find_bin($basedir,
|
||||
my_find_bin($bindir,
|
||||
["storage/ndb/src/kernel", "libexec", "sbin", "bin"],
|
||||
"ndbd");
|
||||
|
||||
$exe_ndb_mgmd=
|
||||
my_find_bin($basedir,
|
||||
my_find_bin($bindir,
|
||||
["storage/ndb/src/mgmsrv", "libexec", "sbin", "bin"],
|
||||
"ndb_mgmd");
|
||||
|
||||
$exe_ndb_waiter=
|
||||
my_find_bin($basedir,
|
||||
my_find_bin($bindir,
|
||||
["storage/ndb/tools/", "bin"],
|
||||
"ndb_waiter");
|
||||
|
||||
@@ -2128,12 +2128,12 @@ sub environment_setup {
|
||||
if ( ! $opt_skip_ndbcluster )
|
||||
{
|
||||
$ENV{'NDB_MGM'}=
|
||||
my_find_bin($basedir,
|
||||
my_find_bin($bindir,
|
||||
["storage/ndb/src/mgmclient", "bin"],
|
||||
"ndb_mgm");
|
||||
|
||||
$ENV{'NDB_TOOLS_DIR'}=
|
||||
my_find_dir($basedir,
|
||||
my_find_dir($bindir,
|
||||
["storage/ndb/tools", "bin"]);
|
||||
|
||||
$ENV{'NDB_EXAMPLES_DIR'}=
|
||||
@@ -2141,7 +2141,7 @@ sub environment_setup {
|
||||
["storage/ndb/ndbapi-examples", "bin"]);
|
||||
|
||||
$ENV{'NDB_EXAMPLES_BINARY'}=
|
||||
my_find_bin($basedir,
|
||||
my_find_bin($bindir,
|
||||
["storage/ndb/ndbapi-examples/ndbapi_simple", "bin"],
|
||||
"ndbapi_simple", NOT_REQUIRED);
|
||||
|
||||
|
Reference in New Issue
Block a user