Merge branch 'develop' into MXS-121

Conflicts: server/modules/monitor/mysql_mon.c
2015-05-09 04:49:06 +03:00
parent 5a3ed0de9b 593f88489a
commit 49d5409dcb
16 changed files with 165 additions and 44 deletions
--- a/server/modules/monitor/mysql_mon.c
+++ b/server/modules/monitor/mysql_mon.c
@ -1254,3 +1254,4 @@ monitor_clear_pending_status(MONITOR_SERVERS *ptr, int bit)
 {
 	ptr->pending_status &= ~bit;
 }
+y