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

Proposed by Daniël van Eeden
Status: Needs review
Proposed branch: lp:~dveeden/mysql-server/mysql-5.5-bug60878
Merge into: lp:~mysql/mysql-server/mysql-trunk
Diff against target: 46 lines (+23/-6)
1 file modified
client/mysqladmin.cc (+23/-6)
To merge this branch: bzr merge lp:~dveeden/mysql-server/mysql-5.5-bug60878
Reviewer Review Type Date Requested Status
Oracle/MySQL Engineering Pending
Review via email: mp+57919@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
3449. By Daniël van Eeden

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

3450. By Daniël van Eeden

Update help info

3451. By Daniël van Eeden

Merge from mysql-5.5 branch

3452. By Daniël van Eeden

Fix typo

Unmerged revisions

3452. By Daniël van Eeden

Fix typo

3451. By Daniël van Eeden

Merge from mysql-5.5 branch

3450. By Daniël van Eeden

Update help info

3449. By Daniël van Eeden

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

3448. By Daniël van Eeden

Add specific log flushing to mysqladmin (Bug #60878)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
869 }869 }
870 case ADMIN_FLUSH_LOGS:870 case ADMIN_FLUSH_LOGS:
871 {871 {
872 if (mysql_refresh(mysql,REFRESH_LOG))872 if ((argc == 2) && ((strcasecmp(argv[1],"binary") == 0)
873 {873 || (strcasecmp(argv[1],"engine") == 0)
874 my_printf_error(0, "refresh failed; error: '%s'", error_flags,874 || (strcasecmp(argv[1],"error") == 0)
875 mysql_error(mysql));875 || (strcasecmp(argv[1],"general") == 0)
876 return -1;876 || (strcasecmp(argv[1],"relay") == 0)
877 || (strcasecmp(argv[1],"slow") == 0))) {
878 char buff[42];
879 sprintf(buff,"FLUSH /*!50503 %s */ LOGS",argv[1]);
880 if (mysql_query(mysql,buff))
881 {
882 my_printf_error(0, "refresh failed; error: '%s'", error_flags,
883 mysql_error(mysql));
884 return -1;
885 }
886 argc--; argv++;
887 } else {
888 if (mysql_refresh(mysql,REFRESH_LOG))
889 {
890 my_printf_error(0, "refresh failed; error: '%s'", error_flags,
891 mysql_error(mysql));
892 return -1;
893 }
877 }894 }
878 break;895 break;
879 }896 }
@@ -1104,7 +1121,7 @@
1104 drop databasename Delete a database and all its tables\n\1121 drop databasename Delete a database and all its tables\n\
1105 extended-status Gives an extended status message from the server\n\1122 extended-status Gives an extended status message from the server\n\
1106 flush-hosts Flush all cached hosts\n\1123 flush-hosts Flush all cached hosts\n\
1107 flush-logs Flush all logs\n\1124 flush-logs logtype Flush all logs or logs of just one logtype\n\
1108 flush-status Clear status variables\n\1125 flush-status Clear status variables\n\
1109 flush-tables Flush all tables\n\1126 flush-tables Flush all tables\n\
1110 flush-threads Flush the thread cache\n\1127 flush-threads Flush the thread cache\n\

Subscribers

People subscribed via source and target branches

to status/vote changes: