Merge branch 'develop' into binlog_server_wait_data

2016-11-16 15:08:17 +01:00
parent d530779cf3 3b7eec8655
commit cd31b2c2c3
32 changed files with 1454 additions and 402 deletions
--- a/server/modules/routing/binlog/blr_master.c
+++ b/server/modules/routing/binlog/blr_master.c
@ -1229,7 +1229,14 @@ blr_handle_binlog_record(ROUTER_INSTANCE *router, GWBUF *pkt)
                }
                else
                {
+                    /* Terminate replication and exit from main loop */
                    blr_terminate_master_replication(router, ptr, len);
+
+                    gwbuf_free(pkt);
+                    pkt = NULL;
+                    pkt_length = 0;
+
+                    break;
                }

                if (hdr.ok == 0)