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

MDEV-14580: mysql_install_db elements based on dirname of mysql_install_db

Browse Source 
Closes #1086
This commit is contained in:
Daniel Black
2019-01-11 19:35:46 +11:00
committed by Sergei Golubchik
parent 0d3c49ef5d
commit 50e593386f
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/mysql_install_db.sh
View File

@ -253,6 +253,9 @@ then
cannot_find_file my_print_defaults $basedir/bin $basedir/extra cannot_find_file my_print_defaults $basedir/bin $basedir/extra
exit 1 exit 1
fi fi
elif test -x "$(dirname $0)/../@bindir@/my_print_defaults"
then
print_defaults="$(dirname $0)/../@bindir@/my_print_defaults"
else else
print_defaults="@bindir@/my_print_defaults" print_defaults="@bindir@/my_print_defaults"
fi fi
@ -304,6 +307,14 @@ then
cannot_find_file fill_help_tables.sql @pkgdata_locations@ cannot_find_file fill_help_tables.sql @pkgdata_locations@
exit 1 exit 1
fi 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 else
basedir="@prefix@" basedir="@prefix@"
bindir="@bindir@" bindir="@bindir@"