Merge branch '2.0' into 2.1

2017-05-10 09:12:42 +03:00
parent 09349aaa22 898bc3444e
commit 8e2c7fd952
15 changed files with 198 additions and 83 deletions
--- a/server/core/maxscale/poll.h
+++ b/server/core/maxscale/poll.h
@ -57,7 +57,7 @@ void            dShowThreads(DCB *dcb);
 void            dShowEventQ(DCB *dcb);
 void            dShowEventStats(DCB *dcb);

-int             poll_get_stat(POLL_STAT stat);
+int64_t         poll_get_stat(POLL_STAT stat);
 RESULTSET       *eventTimesGetList();

 void            poll_send_message(enum poll_message msg, void *data);