diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-03 17:22:05 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-03 17:22:05 +0200 |
| commit | a249e57b684a23dce4cbb870ca3eb30c77cb9fd6 (patch) | |
| tree | 9c50673311474f7efa0d5d110461ad324c7a62e6 /scripts | |
| parent | 261ce5286f266f1a5fab5e8adc2c08adef658d13 (diff) | |
| parent | 955c7b32226c816b24a2ed1750e12bc0256565ad (diff) | |
| download | mariadb-git-a249e57b684a23dce4cbb870ca3eb30c77cb9fd6.tar.gz | |
Merge 10.1 into 10.2
Temporarily disable a test for
commit 2175bfce3e9da8332f10ab0e0286dc93915533a2
because fixing it in 10.2 requires updating libmariadb.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_install_db.sh | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 959923f3407..681b73dfc9f 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -40,6 +40,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 @@ -242,11 +245,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." @@ -287,6 +285,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 @@ -342,6 +343,16 @@ then exit 1 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" +then + basedir="$dirname0" + bindir="$basedir/@INSTALL_SBINDIR@" + resolveip="$bindir/resolveip" + mysqld="$basedir/@INSTALL_SBINDIR@/mysqld" + srcpkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@" + buildpkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@" + plugindir="$basedir/@INSTALL_PLUGINDIR@" else basedir="@prefix@" bindir="@bindir@" |