From: octo <octo>
Date: Sun, 2 Apr 2006 08:33:42 +0000 (+0000)
Subject: svn merge -r555:556 trunk tags/collectd-3.8.3
X-Git-Tag: collectd-3.8.3^0
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=246654f11370fef7870ad6feb40b72f626f59ab5;p=collectd.git

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

diff --git a/src/mysql.c b/src/mysql.c
index ac65f75a..4342dea0 100644
--- 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))