database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Bug#58159 mtr.pl can't run out of source build with NDB

Browse Source 
- 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:
Magnus Blåudd
2010-11-12 11:50:37 +01:00
parent c7e273b531
commit b57fd36736
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/mysql-test-run.pl
View File

@@ -1752,17 +1752,17 @@ sub executable_setup () {
if ( ! $opt_skip_ndbcluster ) if ( ! $opt_skip_ndbcluster )
{ {
$exe_ndbd= $exe_ndbd=
my_find_bin($basedir, my_find_bin($bindir,
["storage/ndb/src/kernel", "libexec", "sbin", "bin"], ["storage/ndb/src/kernel", "libexec", "sbin", "bin"],
"ndbd"); "ndbd");
$exe_ndb_mgmd= $exe_ndb_mgmd=
my_find_bin($basedir, my_find_bin($bindir,
["storage/ndb/src/mgmsrv", "libexec", "sbin", "bin"], ["storage/ndb/src/mgmsrv", "libexec", "sbin", "bin"],
"ndb_mgmd"); "ndb_mgmd");
$exe_ndb_waiter= $exe_ndb_waiter=
my_find_bin($basedir, my_find_bin($bindir,
["storage/ndb/tools/", "bin"], ["storage/ndb/tools/", "bin"],
"ndb_waiter"); "ndb_waiter");
@@ -2128,12 +2128,12 @@ sub environment_setup {
if ( ! $opt_skip_ndbcluster ) if ( ! $opt_skip_ndbcluster )
{ {
$ENV{'NDB_MGM'}= $ENV{'NDB_MGM'}=
my_find_bin($basedir, my_find_bin($bindir,
["storage/ndb/src/mgmclient", "bin"], ["storage/ndb/src/mgmclient", "bin"],
"ndb_mgm"); "ndb_mgm");
$ENV{'NDB_TOOLS_DIR'}= $ENV{'NDB_TOOLS_DIR'}=
my_find_dir($basedir, my_find_dir($bindir,
["storage/ndb/tools", "bin"]); ["storage/ndb/tools", "bin"]);
$ENV{'NDB_EXAMPLES_DIR'}= $ENV{'NDB_EXAMPLES_DIR'}=
@@ -2141,7 +2141,7 @@ sub environment_setup {
["storage/ndb/ndbapi-examples", "bin"]); ["storage/ndb/ndbapi-examples", "bin"]);
$ENV{'NDB_EXAMPLES_BINARY'}= $ENV{'NDB_EXAMPLES_BINARY'}=
my_find_bin($basedir, my_find_bin($bindir,
["storage/ndb/ndbapi-examples/ndbapi_simple", "bin"], ["storage/ndb/ndbapi-examples/ndbapi_simple", "bin"],
"ndbapi_simple", NOT_REQUIRED); "ndbapi_simple", NOT_REQUIRED);