Merge branch 'develop' into MXS-544

2016-02-29 10:18:49 +02:00
parent f03865f32a 87ccff097d
commit bf24f18805
128 changed files with 6094 additions and 3949 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, "");