diff options
Diffstat (limited to 'scripts/mysql_install_db.sh')
-rw-r--r-- | scripts/mysql_install_db.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index f56de12d931..f1249e1d06b 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -253,6 +253,9 @@ then cannot_find_file my_print_defaults $basedir/bin $basedir/extra exit 1 fi +elif test -x "$(dirname $0)/../@bindir@/my_print_defaults" +then + print_defaults="$(dirname $0)/../@bindir@/my_print_defaults" else print_defaults="@bindir@/my_print_defaults" fi @@ -304,6 +307,14 @@ then cannot_find_file fill_help_tables.sql @pkgdata_locations@ exit 1 fi +# relative from where the script was run for a relocatable install +elif test -x "$(dirname $0)/../@INSTALL_SBINDIR@/mysqld" +then + basedir="$(dirname $0)/../" + bindir="$basedir/@INSTALL_SBINDIR@" + resolveip="$bindir/resolveip" + mysqld="$basedir/@INSTALL_SBINDIR@/mysqld" + pkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@" else basedir="@prefix@" bindir="@bindir@" |