svn merge -r555:556 trunk tags/collectd-3.8.3

diff --git a/src/mysql.c b/src/mysql.c
index ac65f75a30ebf6b54d3b1158ea03b500387437f7..4342dea0211fb2d862ee4fc5e999dd4aa9d28a09 100644 (file)
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -366,6 +366,9 @@ static void mysql_read (void)
                return;
 
        query = "SHOW STATUS";
+       if (mysql_get_server_version (con) >= 50002)
+               query = "SHOW GLOBAL STATUS";
+
        query_len = strlen (query);
 
        if (mysql_real_query (con, query, query_len))