Merge branch 'release-1.2' into develop

2015-07-15 11:38:27 +03:00
parent 78eab19c62 124ad82de4
commit b756690123
6 changed files with 477 additions and 262 deletions
--- a/server/core/config.c
+++ b/server/core/config.c
@ -2053,6 +2053,7 @@ static char *monitor_params[] =
                "passwd",
 		"script",
 		"events",
+		"mysql51_replication",
 		"monitor_interval",
 		"detect_replication_lag",
 		"detect_stale_master",