Percona Server moved to https://jira.percona.com/projects/PS

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

  1. 5.6-ps-bug1334719
  2. Merge into 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:~sergei.glushchenko/percona-server/5.6-ps-bug1334719
Merge into: lp: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:~sergei.glushchenko/percona-server/5.6-ps-bug1334719
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+232902@code.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
1=== modified file 'sql/mysqld.cc'
2--- sql/mysqld.cc 2014-08-22 10:02:24 +0000
3+++ sql/mysqld.cc 2014-09-01 14:54:27 +0000
4@@ -460,7 +460,7 @@
5 my_bool relay_log_recovery;
6 my_bool opt_sync_frm, opt_allow_suspicious_udfs;
7 my_bool opt_secure_auth= 0;
8-char* opt_secure_file_priv;
9+char* opt_secure_file_priv= NULL;
10 my_bool opt_secure_file_priv_noarg= FALSE;
11 my_bool opt_log_slow_admin_statements= 0;
12 my_bool opt_log_slow_slave_statements= 0;
13@@ -8980,7 +8980,7 @@
14 if (argument == NULL)
15 {
16 opt_secure_file_priv_noarg= TRUE;
17- opt_secure_file_priv= my_strdup("ON", MYF(0));
18+ opt_secure_file_priv= const_cast<char*>("ON");
19 }
20 else
21 {

Subscribers

People subscribed via source and target branches