Merge branch 'develop' into MXS-121

2015-05-09 12:08:05 +03:00
parent ba3c29c72b a8396a88b5
commit 788c0b3428
5 changed files with 19 additions and 18 deletions
--- a/server/modules/monitor/mysql_mon.c
+++ b/server/modules/monitor/mysql_mon.c
@ -1254,4 +1254,4 @@ monitor_clear_pending_status(MONITOR_SERVERS *ptr, int bit)
 {
 	ptr->pending_status &= ~bit;
 }
-y
+