Merge lp://qastaging/~sergei.glushchenko/percona-server/5.6-ps-bug1334719 into lp://qastaging/percona-server/5.6

Proposed by Sergei Glushchenko
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 665
Proposed branch: lp://qastaging/~sergei.glushchenko/percona-server/5.6-ps-bug1334719
Merge into: lp://qastaging/percona-server/5.6
Diff against target: 21 lines (+2/-2)
1 file modified
sql/mysqld.cc (+2/-2)
To merge this branch: bzr merge lp://qastaging/~sergei.glushchenko/percona-server/5.6-ps-bug1334719
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+232902@code.qastaging.launchpad.net

Description of the change

    Manual merge fix for bug 1334719. Since memory allocations for
    opt_secure_file_priv handled differently in 5.5 and 5.6, the fix is
    different.

    Fix is not to assign const value "ON" to opt_secure_file_priv
    instead of allocating it with my_strdup.

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/707/

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

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