diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2014-11-06 12:14:05 +0100 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2014-11-06 12:14:05 +0100 |
| commit | 5a59bf7a8af7f8f8a45c98d6e7315ce081ee8f56 (patch) | |
| tree | df52e0fce51a72c1cbe84f689967dfdbce8ea25a /mysys | |
| parent | bd7e5aba6cffeaa3bf5d37c813b64cdd608a3fc4 (diff) | |
| download | mariadb-git-5a59bf7a8af7f8f8a45c98d6e7315ce081ee8f56.tar.gz | |
Bug#19974500: SERVER 5.5 / DEBUG DOESN\'T COMPILE WITH GCC 4.9.1
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.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/thr_alarm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index 5fb4e544411..15e9125e533 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -254,7 +254,7 @@ void thr_end_alarm(thr_alarm_t *alarmed) { 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) my_free(alarm_data); found++; |