diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-25 00:57:34 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-25 00:57:34 +0200 |
| commit | 1a6373e8e2f0c8c5ca6b8ef5076dcb2948eeb41a (patch) | |
| tree | ff2e875015b39ca3c66eba19d145dd014d4e768e /extra/libevent/epoll.c | |
| parent | b16c389248d03f0c3de549884f607f3f191827b4 (diff) | |
| parent | 5e100a64b51aa2dd09a9a1679413fa03797a95a2 (diff) | |
| download | mariadb-git-1a6373e8e2f0c8c5ca6b8ef5076dcb2948eeb41a.tar.gz | |
Merge with MySQL 5.1.53
Open issues:
- A better fix for #57688; Igor is working on this
- Test failure in index_merge_innodb.test ; Igor promised to look at this
- Some Innodb tests fails (need to merge with latest xtradb) ; Kristian promised to look at this.
- Failing tests: innodb_plugin.innodb_bug56143 innodb_plugin.innodb_bug56632 innodb_plugin.innodb_bug56680 innodb_plugin.innodb_bug57255
- Werror is disabled; Should be enabled after merge with xtradb.
Diffstat (limited to 'extra/libevent/epoll.c')
| -rw-r--r-- | extra/libevent/epoll.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/extra/libevent/epoll.c b/extra/libevent/epoll.c index de10dac2425..93ed5b83aa4 100644 --- a/extra/libevent/epoll.c +++ b/extra/libevent/epoll.c @@ -155,7 +155,8 @@ epoll_init(struct event_base *base) } static int -epoll_recalc(struct event_base *base, void *arg, int max) +epoll_recalc(struct event_base *base __attribute__((unused)), void *arg, + int max) { struct epollop *epollop = arg; |