database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.1 into 10.1

Browse Source 
This is joint work with Oleksandr Byelkin.
This commit is contained in:
Marko Mäkelä
2019-02-02 13:00:15 +02:00
parent c1e1764fc4 d9d83f1d92
commit 213ece2f2e
101 changed files with 2789 additions and 7471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/mysql_install_db.sh
View File

@ -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
@ -235,11 +238,6 @@ cannot_find_file()
done
fi
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 compiled from source, you need to either run 'make install' to"
echo "copy the software into the correct location ready for operation."
@ -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@"