1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#19974500: SERVER 5.5 / DEBUG DOESN\'T COMPILE WITH GCC 4.9.1

Browse Source 
Fix broken gcc 4.9.1 debug build by removing end of line noise.

In 5.6+ this issue was already fixed by:
------------------------------------------------------------
revno: 3091
committer: Davi Arnaut <davi.arnaut@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2011-05-16 11:30:54 -0300
message:
  Fix warnings emitted by Clang.
This commit is contained in:
Jon Olav Hauglid 2014-11-06 12:14:05 +01:00
parent bd7e5aba6c
commit 5a59bf7a8a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysys/thr_alarm.c
View File

@ -254,7 +254,7 @@ void thr_end_alarm(thr_alarm_t *alarmed)
{ {
if ((ALARM*) queue_element(&alarm_queue,i) == alarm_data) if ((ALARM*) queue_element(&alarm_queue,i) == alarm_data)
{ {
queue_remove(&alarm_queue,i),MYF(0); queue_remove(&alarm_queue,i);
if (alarm_data->malloced) if (alarm_data->malloced)
my_free(alarm_data); my_free(alarm_data);
found++; found++;