Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop

2015-02-16 09:21:38 +00:00
parent ac3c264bf3 4e5c4c0b6a
commit 9dfa4378b4
16 changed files with 160 additions and 168 deletions
--- a/server/core/poll.c
+++ b/server/core/poll.c
@ -437,7 +437,7 @@ poll_waitevents(void *arg)
 {
 struct epoll_event events[MAX_EVENTS];
 int		   i, nfds, timeout_bias = 1;
-int		   thread_id = (int)arg;
+intptr_t	   thread_id = (intptr_t)arg;
 DCB                *zombies = NULL;
 int		   poll_spins = 0;