Merge lp:~sergei.glushchenko/percona-server/5.5-ps-bug1334570 into lp:percona-server/5.5

Proposed by Sergei Glushchenko on 2014-09-01
Status: Merged
Approved by: Alexey Kopytov on 2014-09-08
Approved revision: 692
Merged at revision: 697
Proposed branch: lp:~sergei.glushchenko/percona-server/5.5-ps-bug1334570
Merge into: lp:percona-server/5.5
Diff against target: 21 lines (+2/-2)
1 file modified
plugin/scalability_metrics/scalability_metrics.c (+2/-2)
To merge this branch: bzr merge lp:~sergei.glushchenko/percona-server/5.5-ps-bug1334570
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2014-09-01 Approve on 2014-09-08
Review via email: mp+232840@code.launchpad.net

This proposal supersedes a proposal from 2014-09-01.

Description of the change

Fixed by passing TRUE into list_free to also release list elements.

http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/1041/

Tested manually with ./mtr scalability_metrics --valgrind

To post a comment you must log in.
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugin/scalability_metrics/scalability_metrics.c'
2--- plugin/scalability_metrics/scalability_metrics.c 2014-02-10 13:46:53 +0000
3+++ plugin/scalability_metrics/scalability_metrics.c 2014-09-01 04:32:43 +0000
4@@ -173,7 +173,7 @@
5 if (new_val == CTL_OFF)
6 {
7 mysql_mutex_lock(&thd_list_mutex);
8- list_free(thd_list_root, FALSE);
9+ list_free(thd_list_root, TRUE);
10 thd_list_root= NULL;
11 mysql_mutex_unlock(&thd_list_mutex);
12 }
13@@ -196,7 +196,7 @@
14 static
15 int sm_plugin_deinit(void *arg __attribute__((unused)))
16 {
17- list_free(thd_list_root, FALSE);
18+ list_free(thd_list_root, TRUE);
19 thd_list_root= NULL;
20
21 mysql_mutex_destroy(&thd_list_mutex);

Subscribers

People subscribed via source and target branches