diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-06-18 11:51:27 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-06-21 10:15:27 +0200 |
| commit | 1db1340c0c5302e16c88528d89f583f4f1b7bc90 (patch) | |
| tree | acea1e8310de537d8988db94f5de3cca0c1bb6b4 /scripts/mysql_install_db.sh | |
| parent | 53db5edbcf7cc736e9102f3b5c15907278c42450 (diff) | |
| download | mariadb-git-1db1340c0c5302e16c88528d89f583f4f1b7bc90.tar.gz | |
MDEV-14578: mysql_install_db install unix_socket plugin when --auth-root-authentication-method=socket
post-merge fixes
Diffstat (limited to 'scripts/mysql_install_db.sh')
| -rw-r--r-- | scripts/mysql_install_db.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 9e3bc35423a..0a596e1e03b 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -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 |