Merge lp:~dveeden/mysql-server/mysql-5.5-bug61038 into lp:~mysql/mysql-server/mysql-trunk

[Daniël van Eeden]

Unmerged revisions

3454. By Daniël van Eeden on 2011-05-03

Change variables from log-err to error-log. Suggest the use of the
mysqld section instead of safe_mysqld. Also change safe_mysqld to
mysqld_safe.

3453. By Daniël van Eeden on 2011-05-03

Merge from mysql-5.5

3452. By Daniël van Eeden on 2011-04-18

Fix typo

3451. By Daniël van Eeden on 2011-04-17

Merge from mysql-5.5 branch

3450. By Daniël van Eeden on 2011-04-15

Update help info

3449. By Daniël van Eeden on 2011-04-15

Adjust version, this is supported from 5.5.3 according to
the docs, not since 5.5.0.

3448. By Daniël van Eeden on 2011-04-15

Add specific log flushing to mysqladmin (Bug #60878)

3447. By Serge Kozlov on 2011-04-14

autocommit 5.1 -> 5.5

3446. By Sergey Glukhov on 2011-04-14

automerge

3445. By Sergey Glukhov on 2011-04-14

5.1 -> 5.5 merge

=== modified file 'client/mysqladmin.cc'
--- client/mysqladmin.cc	2011-02-11 14:38:34 +0000
+++ client/mysqladmin.cc	2011-05-03 12:09:59 +0000
@@ -869,11 +869,28 @@
     }
     case ADMIN_FLUSH_LOGS:
     {
-      if (mysql_refresh(mysql,REFRESH_LOG))
-      {
-	my_printf_error(0, "refresh failed; error: '%s'", error_flags,
-			mysql_error(mysql));
-	return -1;
+      if ((argc == 2) && ((strcasecmp(argv[1],"binary") == 0) 
+				|| (strcasecmp(argv[1],"engine") == 0)
+				|| (strcasecmp(argv[1],"error") == 0)
+				|| (strcasecmp(argv[1],"general") == 0)
+				|| (strcasecmp(argv[1],"relay") == 0)
+				|| (strcasecmp(argv[1],"slow") == 0))) {
+        char buff[42];
+        sprintf(buff,"FLUSH /*!50503 %s */ LOGS",argv[1]);
+        if (mysql_query(mysql,buff))
+        {
+          my_printf_error(0, "refresh failed; error: '%s'", error_flags,
+   	   	          mysql_error(mysql));
+	  return -1;
+	}
+        argc--; argv++;
+      } else {
+        if (mysql_refresh(mysql,REFRESH_LOG))
+        {
+	  my_printf_error(0, "refresh failed; error: '%s'", error_flags,
+			  mysql_error(mysql));
+	  return -1;
+        }
       }
       break;
     }
@@ -1104,7 +1121,7 @@
   drop databasename	Delete a database and all its tables\n\
   extended-status       Gives an extended status message from the server\n\
   flush-hosts           Flush all cached hosts\n\
-  flush-logs            Flush all logs\n\
+  flush-logs logtype    Flush all logs or logs of just one logtype\n\
   flush-status		Clear status variables\n\
   flush-tables          Flush all tables\n\
   flush-threads         Flush the thread cache\n\

=== modified file 'support-files/mysql-log-rotate.sh'
--- support-files/mysql-log-rotate.sh	2005-01-18 16:35:32 +0000
+++ support-files/mysql-log-rotate.sh	2011-05-03 12:09:59 +0000
@@ -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:
+# in the [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
@@ -13,7 +13,8 @@
 # password = <secret> 
 # user= root
 #
-# where "<secret>" is the password. 
+# where "<secret>" is the password. mysqladmin will also
+# read the [client] section. 
 #
 # ATTENTION: This /root/.my.cnf should be readable ONLY
 # for root !
@@ -22,7 +23,7 @@
         # create 600 mysql mysql
         notifempty
 	daily
-        rotate 3
+        rotate 5
         missingok
         compress
     postrotate