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

Proposed by Daniël van Eeden
Status: Superseded
Proposed branch: lp://qastaging/~dveeden/mysql-server/mysql-5.5-bug61038
Merge into: lp://qastaging/~mysql/mysql-server/mysql-trunk
Diff against target: 82 lines (+29/-11)
2 files modified
client/mysqladmin.cc (+23/-6)
support-files/mysql-log-rotate.sh (+6/-5)
To merge this branch: bzr merge lp://qastaging/~dveeden/mysql-server/mysql-5.5-bug61038
Reviewer Review Type Date Requested Status
Oracle/MySQL Engineering Pending
Review via email: mp+59763@code.qastaging.launchpad.net
To post a comment you must log in.

Unmerged revisions

3454. By Daniël van Eeden

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

Merge from mysql-5.5

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)

3447. By Serge Kozlov

autocommit 5.1 -> 5.5

3446. By Sergey Glukhov

automerge

3445. By Sergey Glukhov

5.1 -> 5.5 merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: