diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-16 10:08:30 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-16 10:08:30 +0300 |
commit | 734db318ac69f60959bcd0d6c9116a3681449a38 (patch) | |
tree | cb8ccd4ecfebe752ec559834d3bf083efb9c8cd4 /scripts/mysql_install_db.sh | |
parent | b151cc2b0b1fc938de91035fbafc46667d9019e3 (diff) | |
parent | 8716bb3b72b7f5fed69b6dde413c2138f6d175b2 (diff) | |
download | mariadb-git-734db318ac69f60959bcd0d6c9116a3681449a38.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'scripts/mysql_install_db.sh')
-rw-r--r-- | scripts/mysql_install_db.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 294d0816a6b..8a0ade99d69 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -242,6 +242,11 @@ 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." @@ -343,7 +348,7 @@ else basedir="@prefix@" bindir="@bindir@" resolveip="$bindir/resolveip" - mysqld="@libexecdir@/mysqld" + mysqld="@sbindir@/mysqld" srcpkgdatadir="@pkgdatadir@" buildpkgdatadir="@pkgdatadir@" plugindir="@pkgplugindir@" |