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/poll.c
+++ b/server/core/poll.c
@ -1517,8 +1517,7 @@ dShowEventStats(DCB *pdcb)
 * @param stat  The required statistic
 * @return      The value of that statistic
 */
-int
-poll_get_stat(POLL_STAT stat)
+int64_t poll_get_stat(POLL_STAT stat)
 {
    switch (stat)
    {