hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge from develop

Browse Source 
Merge from develop
This commit is contained in:
MassimilianoPinto
2015-09-10 14:53:50 +02:00
parent de593d0474 7d00a3670d
commit c9fd82839b
3 changed files with 35 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/modules/include/blr.h
View File

@ -148,6 +148,7 @@
#define BLR_MASTER_BACKOFF_TIME 10 #define BLR_MASTER_BACKOFF_TIME 10
#define BLR_MAX_BACKOFF 60 #define BLR_MAX_BACKOFF 60
<<<<<<< HEAD
/* max size for error message returned to client */ /* max size for error message returned to client */
#define BINLOG_ERROR_MSG_LEN 385 #define BINLOG_ERROR_MSG_LEN 385

2
server/modules/routing/binlog/blr_file.c
View File

@ -66,7 +66,6 @@ extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[]; extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info; extern __thread log_info_t tls_log_info;
static int blr_file_create(ROUTER_INSTANCE *router, char *file); static int blr_file_create(ROUTER_INSTANCE *router, char *file);
static void blr_file_append(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); 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'; label[0] = 'B';
} }
<<<<<<< HEAD
/** /**
* Read any previously saved master data * Read any previously saved master data
* *

3
server/modules/routing/binlog/maxbinlogcheck.c
View File

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