Merge from develop

Merge from develop

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
 

server/modules/routing/binlog/blr_file.c

@@ -66,7 +66,6 @@ extern int lm_enabled_logfiles_bitmask;
 extern size_t         log_ses_count[];
 extern __thread log_info_t tls_log_info;
 
-
 static int  blr_file_create(ROUTER_INSTANCE *router, char *file);
 static void blr_file_append(ROUTER_INSTANCE *router, char *file);
 static void blr_log_header(logfile_id_t file, char *msg, uint8_t *ptr);
@@ -1477,6 +1476,7 @@ blr_format_event_size(double *event_size, char *label)
 		label[0] = 'B';
 }
 
+<<<<<<< HEAD
 /**
  * Read any previously saved master data
  *

server/modules/routing/binlog/maxbinlogcheck.c

@@ -208,8 +208,6 @@ int main(int argc, char **argv) {
 
 	close(inst->binlog_fd);
 
-        skygw_log_sync_all();
-
 	LOGIF(LM, (skygw_log_write_flush(LOGFILE_MESSAGE,
 		"Check retcode: %i, Binlog Pos = %llu", ret, inst->binlog_position)));
 
@@ -247,4 +245,3 @@ printUsage(const char *progname)
 	printf("  -?|--help             Print this help text\n");
 }
 
-