Merge branch '2.0' into develop

2016-09-09 15:12:58 +03:00
parent 07588a515d abd1ea53a6
commit d7f79942be
48 changed files with 1658 additions and 547 deletions
--- a/server/include/monitor.h
+++ b/server/include/monitor.h
@ -133,7 +133,6 @@ typedef enum

 #define MONITOR_INTERVAL 10000 // in milliseconds
 #define MONITOR_DEFAULT_ID 1UL // unsigned long value
-#define MONITOR_MAX_NUM_SLAVES 20 //number of MySQL slave servers associated to a MySQL master server

 /*
 * Create declarations of the enum for monitor events and also the array of