Merge pull request #313 from tiwilliam/master

Add two new options for the MySQL plugin

diff --cc src/collectd.conf.in
Simple merge

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/mysql.c
index 6337ab4,8b660a3..a6b1e5e
--- 1/src/mysql.c
--- 2/src/mysql.c
+++ b/src/mysql.c
@@@ -285,9 -300,10 +300,11 @@@ static MYSQL *getconnection (mysql_data
  
  static void set_host (mysql_database_t *db, char *buf, size_t buflen)
  {
-       if ((db->host == NULL)
+       if (db->alias)
+               sstrncpy (buf, db->alias, buflen);
+       else if ((db->host == NULL)
                        || (strcmp ("", db->host) == 0)
 +                      || (strcmp ("127.0.0.1", db->host) == 0)
                        || (strcmp ("localhost", db->host) == 0))
                sstrncpy (buf, hostname_g, buflen);
        else