diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-19 16:47:45 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-19 16:47:45 +0100 |
| commit | 91d506cf2d5c143f7eb74e776b1417cf2acaacd8 (patch) | |
| tree | a28ef3ac281a9d1b870d0cfab8c1cf673561a9bc /scripts/mysql_install_db.sh | |
| parent | 88b6dc4db5567951f9c0d0baa6e965d44a7130b1 (diff) | |
| parent | 431da59f1ce2b594ef465563bf18f670f07a1b32 (diff) | |
| download | mariadb-git-91d506cf2d5c143f7eb74e776b1417cf2acaacd8.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'scripts/mysql_install_db.sh')
| -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 681b73dfc9f..8bad8c4000b 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -303,6 +303,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 @@ -344,12 +346,12 @@ then fi plugindir=`find_in_dirs --dir auth_socket.so $basedir/lib*/plugin $basedir/lib*/mysql/plugin` # 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@" plugindir="$basedir/@INSTALL_PLUGINDIR@" |