[Pkg-mysql-commits] [mariadb-5.5] 02/03: Import improvements in the mysql-5.5 Debian git repository up and until commit 26dbcd7b

[Otto Kekäläinen]

This is an automated email from the git hooks/post-receive script.

ottok-guest pushed a commit to branch master
in repository mariadb-5.5.

commit 20ece5fd823783b114822403f9ef98b47127fe70
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Tue Sep 2 16:56:39 2014 +0300

    Import improvements in the mysql-5.5 Debian git repository up and until commit 26dbcd7b
---
 debian/mariadb-server-5.5.install                | 1 +
 debian/mariadb-server-5.5.mysql-server.logrotate | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/mariadb-server-5.5.install b/debian/mariadb-server-5.5.install
index 82e4310..5d1244e 100644
--- a/debian/mariadb-server-5.5.install
+++ b/debian/mariadb-server-5.5.install
@@ -1,3 +1,4 @@
+etc/apparmor.d/usr.sbin.mysqld
 etc/mysql/conf.d/mysqld_safe_syslog.cnf
 etc/mysql/debian-start
 usr/bin/aria_chk
diff --git a/debian/mariadb-server-5.5.mysql-server.logrotate b/debian/mariadb-server-5.5.mysql-server.logrotate
index 0f0de51..05c2d68 100644
--- a/debian/mariadb-server-5.5.mysql-server.logrotate
+++ b/debian/mariadb-server-5.5.mysql-server.logrotate
@@ -1,8 +1,8 @@
-# - I put everything in one block and added sharedscripts, so that mysql gets 
+# - I put everything in one block and added sharedscripts, so that mysql gets
 #   flush-logs'd only once.
 #   Else the binary logs would automatically increase by n times every day.
 # - The error log is obsolete, messages go to syslog now.
-/var/log/mysql.log /var/log/mysql/mysql.log /var/log/mysql/mysql-slow.log {
+/var/log/mysql.log /var/log/mysql/mysql.log /var/log/mysql/mysql-slow.log /var/log/mysql/error.log {
 	daily
 	rotate 7
 	missingok
@@ -12,14 +12,14 @@
 	postrotate
 		test -x /usr/bin/mysqladmin || exit 0
 
-		# If this fails, check debian.conf! 
+		# If this fails, check debian.conf!
 		MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
 		if [ -z "`$MYADMIN ping 2>/dev/null`" ]; then
 		  # Really no mysqld or rather a missing debian-sys-maint user?
 		  # If this occurs and is not a error please report a bug.
 		  if ps cax | grep -q mysqld; then
  		    exit 1
-		  fi 
+		  fi
 		else
 		  $MYADMIN flush-logs
 		fi

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git