Merge 10.3 into 10.4

This commit is contained in:
Marko Mäkelä 2018-08-16 10:08:30 +03:00
commit 734db318ac
335 changed files with 7434 additions and 2282 deletions

View file

@ -17,7 +17,6 @@ Description=MariaDB @VERSION@ database server
Documentation=man:mysqld(8)
Documentation=https://mariadb.com/kb/en/library/systemd/
After=network.target
After=syslog.target
[Install]
WantedBy=multi-user.target

View file

@ -22,7 +22,6 @@ Description=MariaDB @VERSION@ database server (multi-instance)
Documentation=man:mysqld(8)
Documentation=https://mariadb.com/kb/en/library/systemd/
After=network.target
After=syslog.target
ConditionPathExists=@sysconf2dir@/my%I.cnf

View file

@ -14,8 +14,23 @@
# Version 1.0
#
basedir=/usr/local/mysql
bindir=/usr/local/mysql/bin
### BEGIN INIT INFO
# Provides: mysqld_multi
# Required-Start: $local_fs $network $remote_fs
# Should-Start: ypbind nscd ldap ntpd xntpd
# Required-Stop: $local_fs $network $remote_fs
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Start and stop multiple mysql database server daemon instances
# Description: Controls multiple MariaDB database server daemon instances
### END INIT INFO
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
NAME=mysqld_multi
DESC=mysqld_multi
basedir=/usr
bindir=/usr/bin
if test -x $bindir/mysqld_multi
then