Merge from develop

2015-09-10 14:53:50 +02:00
parent de593d0474 7d00a3670d
commit c9fd82839b
3 changed files with 35 additions and 37 deletions
--- a/server/modules/include/blr.h
+++ b/server/modules/include/blr.h
@ -148,6 +148,7 @@
 #define	BLR_MASTER_BACKOFF_TIME	10
 #define BLR_MAX_BACKOFF		60

+<<<<<<< HEAD
 /* max size for error message returned to client */
 #define BINLOG_ERROR_MSG_LEN	385