Merge branch 'develop' into MAX-324

server/core/poll.c

@@ -15,7 +15,6 @@
  *
  * Copyright MariaDB Corporation Ab 2013-2014
  */
-#include <my_config.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
@@ -438,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;