diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_install_db.sh | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 0bbac8ba8c4..b89ea716aab 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -39,6 +39,9 @@ install_params="" auth_root_authentication_method=normal auth_root_socket_user='root' +dirname0=`dirname $0 2>/dev/null` +dirname0=`dirname $dirname0 2>/dev/null` + usage() { cat <<EOF @@ -241,11 +244,6 @@ cannot_find_file() echo "If you don't want to do a full install, you can use the --srcdir" echo "option to only install the mysql database and privilege tables" echo - echo "If you compiled from source, you need to either run 'make install' to" - echo "copy the software into the correct location ready for operation." - echo "If you don't want to do a full install, you can use the --srcdir" - echo "option to only install the mysql database and privilege tables" - echo echo "If you are using a binary release, you must either be at the top" echo "level of the extracted archive, or pass the --basedir option" echo "pointing to that location." @@ -286,6 +284,9 @@ then cannot_find_file my_print_defaults $basedir/bin $basedir/extra exit 1 fi +elif test -n "$dirname0" -a -x "$dirname0/@bindir@/my_print_defaults" +then + print_defaults="$dirname0/@bindir@/my_print_defaults" else print_defaults="@bindir@/my_print_defaults" fi @@ -339,6 +340,15 @@ 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 -n "$dirname0" -a -x "$dirname0/@INSTALL_SBINDIR@/mysqld" +then + basedir="$dirname0" + bindir="$basedir/@INSTALL_SBINDIR@" + resolveip="$bindir/resolveip" + mysqld="$basedir/@INSTALL_SBINDIR@/mysqld" + srcpkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@" + buildpkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@" else basedir="@prefix@" bindir="@bindir@" |