diff options
| author | Magnus Svensson <msvensson@mysql.com> | 2008-11-07 16:22:53 +0100 |
|---|---|---|
| committer | Magnus Svensson <msvensson@mysql.com> | 2008-11-07 16:22:53 +0100 |
| commit | affa5fc62dded23f10507e978cc58e75dccd56bb (patch) | |
| tree | 1528c75af3e9938a9dd1989fd2eafa26521c928e /mysql-test/mysql-test-run.pl | |
| parent | 3be6d967c5d04fa6dbeab1c25f28673d3abf8433 (diff) | |
| download | mariadb-git-affa5fc62dded23f10507e978cc58e75dccd56bb.tar.gz | |
WL#4189 - fix for running from bin dist
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 20fdc6704da..59e9398d442 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1390,7 +1390,7 @@ sub find_mysqld { } return my_find_bin($mysqld_basedir, - ["sql", "libexec", "sbin"], + ["sql", "libexec", "sbin", "bin"], [@mysqld_names]); } @@ -1420,12 +1420,12 @@ sub executable_setup () { { $exe_ndbd= my_find_bin($basedir, - ["storage/ndb/src/kernel", "libexec"], + ["storage/ndb/src/kernel", "libexec", "bin"], "ndbd"); $exe_ndb_mgmd= my_find_bin($basedir, - ["storage/ndb/src/mgmsrv", "libexec"], + ["storage/ndb/src/mgmsrv", "libexec", "bin"], "ndb_mgmd"); $exe_ndb_waiter= @@ -2537,7 +2537,8 @@ sub mysql_install_db { my $bootstrap_sql_file= "$opt_vardir/tmp/bootstrap.sql"; my $path_sql= my_find_file($install_basedir, - ["mysql", "sql/share", "share", "scripts"], + ["mysql", "sql/share", "share/mysql", + "share", "scripts"], "mysql_system_tables.sql", NOT_REQUIRED); |