Merge lp:~gl-az/percona-server/bug1396358-5.5 into lp:percona-server/5.5

Proposed by George Ormond Lorch III on 2014-11-25
Status: Merged
Approved by: Laurynas Biveinis on 2014-11-26
Approved revision: 699
Merged at revision: 716
Proposed branch: lp:~gl-az/percona-server/bug1396358-5.5
Merge into: lp:percona-server/5.5
Diff against target: 12 lines (+1/-1)
1 file modified
mysys/thr_alarm.c (+1/-1)
To merge this branch: bzr merge lp:~gl-az/percona-server/bug1396358-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve on 2014-11-26
Registry Administrators g2 2014-11-25 Pending
Review via email: mp+242852@code.launchpad.net

Description of the change

Simple fix for bug 1396358 - 5.5 fails to compile with debug on Ubuntu Utopic
Trimmed odd, unused bit of code that should have caused compiler error in previous compiler versions.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mysys/thr_alarm.c'
2--- mysys/thr_alarm.c 2014-01-06 05:22:35 +0000
3+++ mysys/thr_alarm.c 2014-11-25 22:45:38 +0000
4@@ -254,7 +254,7 @@
5 {
6 if ((ALARM*) queue_element(&alarm_queue,i) == alarm_data)
7 {
8- queue_remove(&alarm_queue,i),MYF(0);
9+ queue_remove(&alarm_queue,i);
10 if (alarm_data->malloced)
11 my_free(alarm_data);
12 found++;

Subscribers

People subscribed via source and target branches