diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_install_db.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index b89ea716aab..5fa2c4c0e04 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -302,6 +302,8 @@ fi parse_arguments `"$print_defaults" $defaults $defaults_group_suffix --mysqld mysql_install_db` parse_arguments PICK-ARGS-FROM-ARGV "$@" +rel_mysqld="$dirname0/@INSTALL_SBINDIR@/mysqld" + # Configure paths to support files if test -n "$srcdir" then @@ -341,12 +343,12 @@ then exit 1 fi # relative from where the script was run for a relocatable install -elif test -n "$dirname0" -a -x "$dirname0/@INSTALL_SBINDIR@/mysqld" +elif test -n "$dirname0" -a -x "$rel_mysqld" -a ! "$rel_mysqld" -ef "@sbindir@/mysqld" then basedir="$dirname0" - bindir="$basedir/@INSTALL_SBINDIR@" + bindir="$basedir/@INSTALL_BINDIR@" resolveip="$bindir/resolveip" - mysqld="$basedir/@INSTALL_SBINDIR@/mysqld" + mysqld="$rel_mysqld" srcpkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@" buildpkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@" else |