Fix for bug #1264814 Cacti mysql graphs stop working with data input field "server-id" after 1.1 upgrade

Author: roman-vynar

Changelog

@@ -1,3 +1,8 @@
+2013-12-30: version 1.1.1
+-------------------------
+* Cacti mysql graphs stop working with data input field "server-id" after 1.1 upgrade (bug 1264814)
+* Non-integer poller errors for MySQL Query Response Time (bug 1264353)
+
 2013-12-16: version 1.1
 -------------------------
 * Added MySQL template for Zabbix 2.0.x (first release)

VERSION

@@ -1 +1 @@
-1.1
+1.1.1

cacti/definitions/mysql.def

@@ -3339,7 +3339,7 @@
       'Get MySQL Stats' => {
          hash         => 'hash_03_VER_436e47b578d778e94d10a552d7d35bdf',
          input_string =>
-            '<path_php_binary> -q <path_cacti>/scripts/ss_get_mysql_stats.php --host <hostname> --items <items> --user <username> --pass <password> --port <port> --server-id <server-id>',
+            '<path_php_binary> -q <path_cacti>/scripts/ss_get_mysql_stats.php --host <hostname> --items <items> --user <username> --pass <password> --port <port> --server-id <serverid>',
          inputs => [
             {  allow_nulls => '',
                hash        => 'hash_07_VER_c8cef6437d22aa62790728f605a68d8e',
@@ -3359,7 +3359,7 @@
             },
             {  allow_nulls => 'on',
                hash        => 'hash_07_VER_5a1b802ba7e92609f8aa2b0521e221e1',
-               name        => 'server-id'
+               name        => 'serverid'
             },
          ],
          outputs => {