database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

WL#4189 - fix for running from bin dist

Browse Source
This commit is contained in:
Magnus Svensson
2008-11-07 16:22:53 +01:00
parent d88716c2cf
commit 3fb892bf79
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1390,7 +1390,7 @@ sub find_mysqld {
} }
return my_find_bin($mysqld_basedir, return my_find_bin($mysqld_basedir,
["sql", "libexec", "sbin"], ["sql", "libexec", "sbin", "bin"],
[@mysqld_names]); [@mysqld_names]);
} }
@ -1420,12 +1420,12 @@ sub executable_setup () {
{ {
$exe_ndbd= $exe_ndbd=
my_find_bin($basedir, my_find_bin($basedir,
["storage/ndb/src/kernel", "libexec"], ["storage/ndb/src/kernel", "libexec", "bin"],
"ndbd"); "ndbd");
$exe_ndb_mgmd= $exe_ndb_mgmd=
my_find_bin($basedir, my_find_bin($basedir,
["storage/ndb/src/mgmsrv", "libexec"], ["storage/ndb/src/mgmsrv", "libexec", "bin"],
"ndb_mgmd"); "ndb_mgmd");
$exe_ndb_waiter= $exe_ndb_waiter=
@ -2537,7 +2537,8 @@ sub mysql_install_db {
my $bootstrap_sql_file= "$opt_vardir/tmp/bootstrap.sql"; my $bootstrap_sql_file= "$opt_vardir/tmp/bootstrap.sql";
my $path_sql= my_find_file($install_basedir, my $path_sql= my_find_file($install_basedir,
["mysql", "sql/share", "share", "scripts"], ["mysql", "sql/share", "share/mysql",
"share", "scripts"],
"mysql_system_tables.sql", "mysql_system_tables.sql",
NOT_REQUIRED); NOT_REQUIRED);