Merge remote-tracking branch 'origin/develop' into MXS-122

2015-06-09 13:51:55 +01:00
parent 393e25e953 9c461450e2
commit 152f9bbc4a
36 changed files with 2333 additions and 1279 deletions
--- a/server/core/config.c
+++ b/server/core/config.c
@ -1728,6 +1728,9 @@ SERVER			*server;
 					obj->element = server_alloc(address,
                                                                    protocol,
                                                                    atoi(port));
+
+					server_set_unique_name(obj->element, obj->object);
+
 					if (obj->element && monuser && monpw)
                                        {
 						serverAddMonUser(obj->element,
@ -1936,6 +1939,8 @@ static char *monitor_params[] =
                "servers",
                "user",
                "passwd",
+		"script",
+		"events",
 		"monitor_interval",
 		"detect_replication_lag",
 		"detect_stale_master",