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

[Daniël van Eeden]

Fix for Bug #60878
http://bugs.mysql.com/bug.php?id=60878

Adds extra argument to mysqladmin flush-logs to specify which log should be flushed.

[lp:~dveeden/mysql-server/mysql-5.5-bug60878]

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.

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

Update help info

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

Merge from mysql-5.5 branch

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

Fix typo

Unmerged revisions

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

3444. By Magne Mahre <email address hidden> on 2011-04-14

Bug#11766320 MYSQL SYMBOLIC LINKS NOT WORKING

When MySQL converted from autotools to CMake, the
preprocessor symbol USE_SYMDIR was omitted by mistake.

Without this symbol, the code for checking .sym files
is not built.

This patch defines USE_SYMDIR when built on MS Windows.

3443. By Serge Kozlov on 2011-04-13

autocommit 5.1->5.5

=== modified file 'client/mysqladmin.cc'
--- client/mysqladmin.cc	2011-02-11 14:38:34 +0000
+++ client/mysqladmin.cc	2011-04-18 20:45: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\