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

Proposed by Sergei Glushchenko
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
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) Approve
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.
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugin/scalability_metrics/scalability_metrics.c'
--- plugin/scalability_metrics/scalability_metrics.c 2014-02-10 13:46:53 +0000
+++ plugin/scalability_metrics/scalability_metrics.c 2014-09-01 04:32:43 +0000
@@ -173,7 +173,7 @@
173 if (new_val == CTL_OFF)173 if (new_val == CTL_OFF)
174 {174 {
175 mysql_mutex_lock(&thd_list_mutex);175 mysql_mutex_lock(&thd_list_mutex);
176 list_free(thd_list_root, FALSE);176 list_free(thd_list_root, TRUE);
177 thd_list_root= NULL;177 thd_list_root= NULL;
178 mysql_mutex_unlock(&thd_list_mutex);178 mysql_mutex_unlock(&thd_list_mutex);
179 }179 }
@@ -196,7 +196,7 @@
196static196static
197int sm_plugin_deinit(void *arg __attribute__((unused)))197int sm_plugin_deinit(void *arg __attribute__((unused)))
198{198{
199 list_free(thd_list_root, FALSE);199 list_free(thd_list_root, TRUE);
200 thd_list_root= NULL;200 thd_list_root= NULL;
201201
202 mysql_mutex_destroy(&thd_list_mutex);202 mysql_mutex_destroy(&thd_list_mutex);

Subscribers

People subscribed via source and target branches