mysql plugin: Use the database instance name for identifying read callbacks.

The database instance is specified as argument to the <Database> block.
Without this fix, we cannot specify two database blocks without the
(optional!) 'Database' option as this would result in registering two read
callbacks with the name 'mysql'.

Thanks to Johan Bergström for reporting this on IRC!

diff --git a/src/mysql.c b/src/mysql.c
index 6b636787555b7e177a09abf20b71cd7cbbb7f9a7..32b352bbdd15919631a60ba78ef6233230dd407f 100644 (file)
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -192,9 +192,9 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */
                ud.data = (void *) db;
                ud.free_func = mysql_database_free;
 
-               if (db->database != NULL)
+               if (db->instance != NULL)
                        ssnprintf (cb_name, sizeof (cb_name), "mysql-%s",
-                                       db->database);
+                                       db->instance);
                else
                        sstrncpy (cb_name, "mysql", sizeof (cb_name));