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

MDEV-14578: mysql_install_db install unix_socket plugin when --auth-root-authentication-method=socket

Browse Source 
post-merge fixes
This commit is contained in:
Sergei Golubchik
2018-06-18 11:51:27 +02:00
parent 53db5edbcf
commit 1db1340c0c
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/mysql_install_db.sh
View File

@ -307,7 +307,7 @@ then
langdir="$basedir/sql/share/english"
srcpkgdatadir="$srcdir/scripts"
buildpkgdatadir="$builddir/scripts"
plugindir="$builddir/plugin/auth_socket/"
plugindir="$builddir/plugin/auth_socket"
elif test -n "$basedir"
then
bindir="$basedir/bin" # only used in the help text
@ -336,7 +336,7 @@ then
cannot_find_file fill_help_tables.sql @pkgdata_locations@
exit 1
fi
plugindir="$basedir/@INSTALL_PLUGINDIR@"
plugindir=`find_in_dirs --dir auth_socket.so $basedir/lib*/plugin $basedir/lib*/mysql/plugin`
else
basedir="@prefix@"
bindir="@bindir@"
@ -344,7 +344,7 @@ else
mysqld="@libexecdir@/mysqld"
srcpkgdatadir="@pkgdatadir@"
buildpkgdatadir="@pkgdatadir@"
plugindir="@INSTALL_PLUGINDIR@"
plugindir="@pkgplugindir@"
fi
# Set up paths to SQL scripts required for bootstrap