6328e3e9fe
Update to the latest upstream version. For more details, see: https://mariadb.com/kb/en/changes-improvements-in-mariadb-109/ Added new dependency on libfmt. Following two patches dropped as the issues were fixed in upstream. * 130-c11_atomics.patch * 140-mips-connect-unaligned.patch The rest of the patches were refreshed. Don't need to disable cassandra and tokudb anymore as they were dropped from upstream tarball. Signed-off-by: Michal Hrusecky <michal@hrusecky.net>
39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
--- a/scripts/mysql_install_db.sh
|
|
+++ b/scripts/mysql_install_db.sh
|
|
@@ -369,6 +369,14 @@ then
|
|
exit 1
|
|
fi
|
|
plugindir=`find_in_dirs --dir auth_pam.so $basedir/lib*/plugin $basedir/lib*/mysql/plugin $basedir/lib/*/mariadb19/plugin`
|
|
+ # Upstream assumes all plugins will be always installed, but in OpenWrt we can
|
|
+ # install a server without plugins if we want to.
|
|
+ if test -z "$plugindir"
|
|
+ then
|
|
+ echo "Could not find plugin directory." >&2
|
|
+ echo "Will continue with \"/usr/lib/mariadb/plugin\"." >&2
|
|
+ plugindir=/usr/lib/mariadb/plugin
|
|
+ fi
|
|
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@/mariadbd"
|
|
@@ -501,7 +509,9 @@ do
|
|
fi
|
|
done
|
|
|
|
-if test -n "$user"
|
|
+# There should be no need for this on OpenWrt. If this turns out to be a wrong guess then
|
|
+# we can revisit.
|
|
+if test -n ""
|
|
then
|
|
if test -z "$srcdir" -a "$in_rpm" -eq 0
|
|
then
|
|
@@ -522,6 +532,10 @@ then
|
|
echo
|
|
fi
|
|
fi
|
|
+fi
|
|
+
|
|
+if test -n "$user"
|
|
+then
|
|
args="$args --user=$user"
|
|
fi
|
|
|