committing changes in /etc after apt run

Package changes:
-mariadb-client-core-10.1 1:10.1.40-0ubuntu0.18.04.1 amd64
+mariadb-client-10.3 1:10.3.15+maria~bionic amd64
+mariadb-client-core-10.3 1:10.3.15+maria~bionic amd64
-mariadb-server 1:10.1.40-0ubuntu0.18.04.1 all
+mariadb-server 1:10.3.15+maria~bionic all
-mariadb-server-core-10.1 1:10.1.40-0ubuntu0.18.04.1 amd64
+mariadb-server-10.3 1:10.3.15+maria~bionic amd64
+mariadb-server-core-10.3 1:10.3.15+maria~bionic amd64

diff --git a/.etckeeper b/.etckeeper
index 4c2955a16c72c1027e80f9a06609134ebdd7589b..47631533a730f0fbbe664853fcf9e5124997c28b 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1975,15 +1975,18 @@ maybe chmod 0755 'logcheck'
 maybe chmod 0755 'logcheck/ignore.d.paranoid'
 maybe chmod 0644 'logcheck/ignore.d.paranoid/cracklib-runtime'
 maybe chmod 0644 'logcheck/ignore.d.paranoid/mariadb-server-10_1'
+maybe chmod 0644 'logcheck/ignore.d.paranoid/mariadb-server-10_3'
 maybe chmod 0755 'logcheck/ignore.d.server'
 maybe chmod 0644 'logcheck/ignore.d.server/gpg-agent'
 maybe chmod 0644 'logcheck/ignore.d.server/libsasl2-modules'
 maybe chmod 0644 'logcheck/ignore.d.server/mariadb-server-10_1'
+maybe chmod 0644 'logcheck/ignore.d.server/mariadb-server-10_3'
 maybe chmod 0644 'logcheck/ignore.d.server/ntpdate'
 maybe chmod 0644 'logcheck/ignore.d.server/rkhunter'
 maybe chmod 0644 'logcheck/ignore.d.server/rsyslog'
 maybe chmod 0755 'logcheck/ignore.d.workstation'
 maybe chmod 0644 'logcheck/ignore.d.workstation/mariadb-server-10_1'
+maybe chmod 0644 'logcheck/ignore.d.workstation/mariadb-server-10_3'
 maybe chmod 0644 'login.defs'
 maybe chmod 0644 'logrotate.conf'
 maybe chmod 0755 'logrotate.d'
@@ -2084,6 +2087,7 @@ maybe chmod 0644 'mtools.conf'
 maybe chmod 0755 'mysql'
 maybe chmod 0755 'mysql/conf.d'
 maybe chmod 0644 'mysql/conf.d/mysql.cnf'
+maybe chmod 0644 'mysql/conf.d/mysqld_safe_syslog.cnf'
 maybe chmod 0644 'mysql/conf.d/mysqldump.cnf'
 maybe chmod 0755 'mysql/debian-start'
 maybe chmod 0600 'mysql/debian.cnf'
@@ -2702,6 +2706,8 @@ maybe chmod 0755 'systemd/system/display-manager.service.wants'
 maybe chmod 0755 'systemd/system/final.target.wants'
 maybe chmod 0755 'systemd/system/getty.target.wants'
 maybe chmod 0755 'systemd/system/graphical.target.wants'
+maybe chmod 0755 'systemd/system/mariadb.service.d'
+maybe chmod 0644 'systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf'
 maybe chmod 0755 'systemd/system/multi-user.target.wants'
 maybe chmod 0755 'systemd/system/network-online.target.wants'
 maybe chmod 0755 'systemd/system/network-pre.target.wants'

diff --git a/apparmor.d/usr.sbin.mysqld b/apparmor.d/usr.sbin.mysqld
index 4ffb7eab550d7cacd741952c0ee1ddfc3f45e981..b1f229b33b477fa47241242fde970dc148799642 100644 (file)
--- a/apparmor.d/usr.sbin.mysqld
+++ b/apparmor.d/usr.sbin.mysqld
@@ -1,4 +1,4 @@
-# This file is intensionally empty to disable apparmor by default for newer
+# This file is intentionally empty to disable apparmor by default for newer
 # versions of MariaDB, while providing seamless upgrade from older versions
 # and from mysql, where apparmor is used.
 #
@@ -11,5 +11,5 @@
 # be used.
 #
 # When upgrading from previous version, users who modified the profile
-# will be promptet to keep or discard it, while for default installs
+# will be prompted to keep or discard it, while for default installs
 # we will automatically disable the profile.

diff --git a/default/mysql b/default/mysql
index 3d3bc80078c1093d267082dc3e08b44607838524..146c5a87a84edeb048a826d82d01e61a24c0f44a 100644 (file)
--- a/default/mysql
+++ b/default/mysql
@@ -1,6 +1,5 @@
 #
-# NOTE: This file is read only by the traditional SysV init script and has been
-# available only in Ubuntu 16.04 and 16.10 and never in a official Debian release.
+# NOTE: This file is read only by the traditional SysV init script.
 # Debian 9 and Ubuntu 17.04 onwards do not normally read this file as they use
 # systemd by default.
 #

diff --git a/init.d/mysql b/init.d/mysql
index c18ef8cdac051ed4367f1759307ae2686ca07e9f..35a52d5d8db126f9b77cdc5b5e93e21dd1619ae6 100755 (executable)
--- a/init.d/mysql
+++ b/init.d/mysql
@@ -32,13 +32,6 @@ if [ -f /etc/default/mysql ]; then
   . /etc/default/mysql
 fi
 
-# Also source default/mariadb in case the installation was upgraded from
-# packages originally installed from MariaDB.org repositories, which have
-# had support for reading /etc/default/mariadb since March 2016.
-if [ -f /etc/default/mariadb ]; then
-  . /etc/default/mariadb
-fi
-
 # Safeguard (relative paths, core dumps..)
 cd /
 umask 077
@@ -165,7 +158,7 @@ case "${1:-''}" in
 
   if ! mysqld_status check_dead warn; then
     log_end_msg 1
-    log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.1/README.Debian.gz!"
+    log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.3/README.Debian.gz!"
     exit -1
   else
     log_end_msg 0
@@ -193,15 +186,8 @@ case "${1:-''}" in
   fi
   ;;
 
-  'bootstrap')
-       # Bootstrap the cluster, start the first node
-       # that initiates the cluster
-       log_daemon_msg "Bootstrapping the cluster" "mysqld"
-       $SELF start "${@:2}" --wsrep-new-cluster
-       ;;
-
   *)
-  echo "Usage: $SELF start|stop|restart|reload|force-reload|status|bootstrap"
+  echo "Usage: $SELF start|stop|restart|reload|force-reload|status"
   exit 1
   ;;
 esac

diff --git a/logcheck/ignore.d.paranoid/mariadb-server-10_3 b/logcheck/ignore.d.paranoid/mariadb-server-10_3
new file mode 100644 (file)
index 0000000..00cc5c3
--- /dev/null
+++ b/logcheck/ignore.d.paranoid/mariadb-server-10_3
@@ -0,0 +1,9 @@
+/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$
+/etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
+/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$
+mysqld\[[0-9]+\]: $
+mysqld\[[0-9]+\]: Version: .* socket: '/var/run/mysqld/mysqld.sock'  port: 3306$
+mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$
+mysqld_safe\[[0-9]+\]: started$
+usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$
+usermod\[[0-9]+\]: change user `mysql' shell from `/bin/false' to `/bin/false'$

diff --git a/logcheck/ignore.d.server/mariadb-server-10_3 b/logcheck/ignore.d.server/mariadb-server-10_3
new file mode 100644 (file)
index 0000000..a0b4792
--- /dev/null
+++ b/logcheck/ignore.d.server/mariadb-server-10_3
@@ -0,0 +1,32 @@
+/etc/init.d/mysql\[[0-9]+\]: [0-9]+ processes alive and '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
+/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$
+/etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
+/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$
+mysqld\[[0-9]+\]: ?$
+mysqld\[[0-9]+\]: .*InnoDB: Shutdown completed
+mysqld\[[0-9]+\]: .*InnoDB: Started;
+mysqld\[[0-9]+\]: .*InnoDB: Starting shutdown\.\.\.$
+mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Normal shutdown$
+mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: ready for connections\.$
+mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Shutdown complete$
+mysqld\[[0-9]+\]: /usr/sbin/mysqld: ready for connections\.$
+mysqld\[[0-9]+\]: .*/usr/sbin/mysqld: Shutdown Complete$
+mysqld\[[0-9]+\]: Version: .* socket
+mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$
+mysqld_safe\[[0-9]+\]: ?$
+mysqld_safe\[[0-9]+\]: able to use the new GRANT command!$
+mysqld_safe\[[0-9]+\]: ended$
+mysqld_safe\[[0-9]+\]: http://www.mysql.com$
+mysqld_safe\[[0-9]+\]: NOTE:  If you are upgrading from a MySQL <= 3.22.10 you should run$
+mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$
+mysqld_safe\[[0-9]+\]: Please report any problems at http://mariadb.org/jira$
+mysqld_safe\[[0-9]+\]: See the manual for more instructions.$
+mysqld_safe\[[0-9]+\]: started$
+mysqld_safe\[[0-9]+\]: Support MySQL by buying support/licenses at https://order.mysql.com$
+mysqld_safe\[[0-9]+\]: The latest information about MySQL is available on the web at$
+mysqld_safe\[[0-9]+\]: the /usr/bin/mysql_fix_privilege_tables. Otherwise you will not be$
+mysqld_safe\[[0-9]+\]: To do so, start the server, then issue the following commands:$
+mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root -h app109 password 'new-password'$
+mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root password 'new-password'$
+usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$
+usermod\[[0-9]+\]: change user `mysql' shell from `/bin/false' to `/bin/false'$

diff --git a/logcheck/ignore.d.workstation/mariadb-server-10_3 b/logcheck/ignore.d.workstation/mariadb-server-10_3
new file mode 100644 (file)
index 0000000..a0b4792
--- /dev/null
+++ b/logcheck/ignore.d.workstation/mariadb-server-10_3
@@ -0,0 +1,32 @@
+/etc/init.d/mysql\[[0-9]+\]: [0-9]+ processes alive and '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
+/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$
+/etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
+/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$
+mysqld\[[0-9]+\]: ?$
+mysqld\[[0-9]+\]: .*InnoDB: Shutdown completed
+mysqld\[[0-9]+\]: .*InnoDB: Started;
+mysqld\[[0-9]+\]: .*InnoDB: Starting shutdown\.\.\.$
+mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Normal shutdown$
+mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: ready for connections\.$
+mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Shutdown complete$
+mysqld\[[0-9]+\]: /usr/sbin/mysqld: ready for connections\.$
+mysqld\[[0-9]+\]: .*/usr/sbin/mysqld: Shutdown Complete$
+mysqld\[[0-9]+\]: Version: .* socket
+mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$
+mysqld_safe\[[0-9]+\]: ?$
+mysqld_safe\[[0-9]+\]: able to use the new GRANT command!$
+mysqld_safe\[[0-9]+\]: ended$
+mysqld_safe\[[0-9]+\]: http://www.mysql.com$
+mysqld_safe\[[0-9]+\]: NOTE:  If you are upgrading from a MySQL <= 3.22.10 you should run$
+mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$
+mysqld_safe\[[0-9]+\]: Please report any problems at http://mariadb.org/jira$
+mysqld_safe\[[0-9]+\]: See the manual for more instructions.$
+mysqld_safe\[[0-9]+\]: started$
+mysqld_safe\[[0-9]+\]: Support MySQL by buying support/licenses at https://order.mysql.com$
+mysqld_safe\[[0-9]+\]: The latest information about MySQL is available on the web at$
+mysqld_safe\[[0-9]+\]: the /usr/bin/mysql_fix_privilege_tables. Otherwise you will not be$
+mysqld_safe\[[0-9]+\]: To do so, start the server, then issue the following commands:$
+mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root -h app109 password 'new-password'$
+mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root password 'new-password'$
+usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$
+usermod\[[0-9]+\]: change user `mysql' shell from `/bin/false' to `/bin/false'$

diff --git a/logrotate.d/mysql-server b/logrotate.d/mysql-server
index 34ef6385e8e3b779316fc3afbdc6fc0703684c0e..4111a276dc3f0552c229ec84140acf7ab6e95886 100644 (file)
--- a/logrotate.d/mysql-server
+++ b/logrotate.d/mysql-server
@@ -11,7 +11,7 @@
        sharedscripts
        postrotate
           test -x /usr/bin/mysqladmin || exit 0
-          if [ -f `my_print_defaults --mysqld | grep -m 1 -oP "pid-file=\K.+$"` ]; then
+          if [ -f `my_print_defaults --mysqld | grep -oP "pid-file=\K[^$]+"` ]; then
             # If this fails, check debian.conf!
             mysqladmin --defaults-file=/etc/mysql/debian.cnf --local flush-error-log \
               flush-engine-log flush-general-log flush-slow-log

diff --git a/mysql/conf.d/mysqld_safe_syslog.cnf b/mysql/conf.d/mysqld_safe_syslog.cnf
new file mode 100644 (file)
index 0000000..08984c1
--- /dev/null
+++ b/mysql/conf.d/mysqld_safe_syslog.cnf
@@ -0,0 +1,3 @@
+[mysqld_safe]
+skip_log_error
+syslog

diff --git a/mysql/debian-start b/mysql/debian-start
index 40c248fd81f1a48876fdbb52f7e5012b4ebbaebe..7940bbe68a5fbe6a47fdfb2602626cff4c1d293e 100755 (executable)
--- a/mysql/debian-start
+++ b/mysql/debian-start
@@ -15,7 +15,7 @@ fi
 
 MYSQL="/usr/bin/mysql --defaults-file=/etc/mysql/debian.cnf"
 MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
-MYUPGRADE="/usr/bin/mysql_upgrade --defaults-extra-file=/etc/mysql/debian.cnf"
+MYUPGRADE="/usr/bin/mysql_upgrade --defaults-extra-file=/etc/mysql/debian.cnf --version-check"
 MYCHECK="/usr/bin/mysqlcheck --defaults-file=/etc/mysql/debian.cnf"
 MYCHECK_SUBJECT="WARNING: mysqlcheck has found corrupt tables"
 MYCHECK_PARAMS="--all-databases --fast --silent"

diff --git a/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf b/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf
new file mode 100644 (file)
index 0000000..6712fa9
--- /dev/null
+++ b/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf
@@ -0,0 +1,11 @@
+# converted using /usr/bin/mariadb-service-convert
+#
+
+[Service]
+
+User=mysql
+StandardOutput=syslog
+StandardError=syslog
+SyslogFacility=daemon
+SyslogLevel=err
+SyslogIdentifier=mysqld