bzr push into mysql-trunk branch (nirbhay.choubey:3248 to 3249) Bug#12546842

[Nirbhay Choubey]

 3249 Nirbhay Choubey	2011-07-08
      Bug#12546842 - 61038: LOGROTATE SCRIPT IN SUPPORT-FILES
                     NEEDS AN UPDATE.
      
      Updated script and option names which got changed long
      back and are not valid now, along with some modifications
      in comments.
     @ support-files/mysql-log-rotate.sh
        Bug 12546842 - 61038: LOGROTATE SCRIPT IN SUPPORT-FILES
                       NEEDS AN UPDATE.
        
        Modified script name, option and comments.

    modified:
      support-files/mysql-log-rotate.sh
 3248 Davi Arnaut	2011-07-07
      Bug#12727287: Maintainer mode compilation fails with gcc 4.6 (#trunk)
      
      GCC 4.6 has a new -Wunused-but-set-variable flag, which is enabled
      by -Wall, that causes GCC to emit a warning whenever a local variable
      is assigned to, but otherwise unused (aside from its declaration).
      
      Since the maintainer mode uses -Wall and -Werror, source code which
      triggers these warnings will be rejected. That is, these warnings
      become hard errors.
      
      The solution is to fix the code which triggers these specific warnings.
      In most of the cases, this is a welcome cleanup as code which triggers
      this warning is probably dead anyway.
     @ sql/handler.cc
        Unused but set.
     @ sql/item_geofunc.cc
        Unused but set.
     @ sql/partition_info.cc
        Unused but set.
     @ sql/rpl_info_file.cc
        buffer_act is a pointer-to-pointer used to pass out the allocated
        buffer. For this, set the pointer properly (and from the desired
        source) and check if allocation fails.
     @ sql/sql_load.cc
        Unused but set.
     @ sql/sql_select.cc
        Unused but set.
     @ storage/innobase/trx/trx0purge.c
        Unused but set.
     @ storage/innobase/trx/trx0rec.c
        Unused but set.
     @ storage/perfschema/pfs_instr.cc
        Unused but set.
     @ storage/perfschema/unittest/pfs_instr_class-t.cc
        Declare within the same ifdef where it's used.

    modified:
      sql/handler.cc
      sql/item_geofunc.cc
      sql/partition_info.cc
      sql/rpl_info_file.cc
      sql/sql_load.cc
      sql/sql_select.cc
      storage/innobase/trx/trx0purge.c
      storage/innobase/trx/trx0rec.c
      storage/perfschema/pfs_instr.cc
      storage/perfschema/unittest/pfs_instr_class-t.cc
=== modified file 'support-files/mysql-log-rotate.sh'
--- a/support-files/mysql-log-rotate.sh	2005-01-18 16:35:32 +0000
+++ b/support-files/mysql-log-rotate.sh	2011-07-08 13:07:03 +0000
@@ -1,13 +1,14 @@
-# This logname can be set in /etc/my.cnf
-# by setting the variable "err-log"
-# in the [safe_mysqld] section as follows:
+# The log file name and location can be set in
+# /etc/my.cnf by setting the "log-error" option
+# in either [mysqld] or [mysqld_safe] 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
-# content:
+# In case the root user has a password, then you
+# have to create a /root/.my.cnf configuration file
+# with the following content:
 #
 # [mysqladmin]
 # password = <secret> 
@@ -15,14 +16,14 @@
 #
 # where "<secret>" is the password. 
 #
-# ATTENTION: This /root/.my.cnf should be readable ONLY
-# for root !
+# ATTENTION: The /root/.my.cnf file should be readable
+# _ONLY_ by root !
 
 @localstatedir@/mysqld.log {
         # create 600 mysql mysql
         notifempty
-	daily
-        rotate 3
+        daily
+        rotate 5
         missingok
         compress
     postrotate

No bundle (reason: useless for push emails).