Merge remote-tracking branch 'origin/5.5' into 10.1

support-files/mysql-log-rotate.sh

@@ -1,9 +1,9 @@
 # This logname can be set in /etc/my.cnf
-# by setting the variable "err-log"
-# in the [safe_mysqld] section as follows:
+# by setting the variable "log-error"
+# in the [mysqld] section as follows:
 #
-# [safe_mysqld]
-# err-log=@localstatedir@/mysqld.log
+# [mysqld]
+# log-error=@localstatedir@/mysqld.log
 #
 # If the root user has a password you have to create a
 # /root/.my.cnf configuration file with the following
@@ -21,7 +21,7 @@
 @localstatedir@/mysqld.log {
         # create 600 mysql mysql
         notifempty
-	daily
+        daily
         rotate 3
         missingok
         compress