Import improvements in the mysql-5.5 Debian git repository up and until commit 26dbcd7b

debian/mariadb-server-5.5.install

+etc/apparmor.d/usr.sbin.mysqld
 etc/mysql/conf.d/mysqld_safe_syslog.cnf
 etc/mysql/debian-start
 usr/bin/aria_chk

debian/mariadb-server-5.5.mysql-server.logrotate

-# - 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