Merge branch '1.2.1-binlog_router_trx' into develop

2016-02-19 18:51:59 +02:00
parent fec1ebe925 59f5880898
commit 28bd7c2202
6 changed files with 615 additions and 211 deletions
--- a/server/modules/routing/binlog/blr.c
+++ b/server/modules/routing/binlog/blr.c
@ -507,6 +507,7 @@ char		task_name[BLRM_TASK_NAME_LEN+1] = "";
 	inst->binlog_position = 0;
 	inst->current_pos = 0;
 	inst->current_safe_event = 0;
+	inst->master_event_state = BLR_EVENT_DONE;

 	strcpy(inst->binlog_name, "");
 	strcpy(inst->prevbinlog, "");