diff options
| author |   Brian Evans <grknight@gentoo.org> | 2019-07-22 15:20:20 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2019-07-22 15:20:20 -0400 |
| commit | 6a716a7a98ae6fe077bca7b5e7f6716086301eec (patch) | |
| tree | 3828af1d2dd8d69043c70da06c9ba0109b36105a | |
| parent | Add LibreSSL patches for MySQL 5.6 (diff) | |
| download | mysql-extras-6a716a7a98ae6fe077bca7b5e7f6716086301eec.tar.gz mysql-extras-6a716a7a98ae6fe077bca7b5e7f6716086301eec.tar.bz2 mysql-extras-6a716a7a98ae6fe077bca7b5e7f6716086301eec.zip | |
Fix custom plugin location for MariaDB >=10.4mysql-extras-20190731-2258Z
Bug: https://bugs.gentoo.org/show_bug.cgi?id=689412
Signed-off-by: Brian Evans <grknight@gentoo.org>
| -rw-r--r-- | 20018_all_mariadb-10.4.5-without-clientlibs-tools.patch | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/20018_all_mariadb-10.4.5-without-clientlibs-tools.patch b/20018_all_mariadb-10.4.5-without-clientlibs-tools.patch index 9cc11e7..e9ba8cf 100644 --- a/20018_all_mariadb-10.4.5-without-clientlibs-tools.patch +++ b/20018_all_mariadb-10.4.5-without-clientlibs-tools.patch @@ -194,6 +194,15 @@ diff -aurN a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh exit 1 fi else +@@ -345,7 +345,7 @@ + cannot_find_file fill_help_tables.sql @pkgdata_locations@ + exit 1 + fi +- plugindir=`find_in_dirs --dir auth_pam.so $basedir/lib*/plugin $basedir/lib*/mysql/plugin` ++ plugindir="$basedir/@INSTALL_PLUGINDIR@" + pamtooldir=$plugindir + # relative from where the script was run for a relocatable install + elif test -n "$dirname0" -a -x "$rel_mysqld" -a ! "$rel_mysqld" -ef "@sbindir@/mysqld" diff -aurN a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh --- a/scripts/wsrep_sst_common.sh 2018-08-04 18:20:58.000000000 -0400 +++ b/scripts/wsrep_sst_common.sh 2018-08-09 12:30:24.976706933 -0400 |