Merge branch '2.1' into develop

This commit is contained in:
Markus Mäkelä
2017-07-24 12:37:25 +03:00
21 changed files with 111 additions and 42 deletions

View File

@ -242,7 +242,7 @@ typedef enum
#define BLR_MAX_BACKOFF 60
/* max size for error message returned to client */
#define BINLOG_ERROR_MSG_LEN 385
#define BINLOG_ERROR_MSG_LEN 700
/* network latency extra wait tme for heartbeat check */
#define BLR_NET_LATENCY_WAIT_TIME 1