Merge branch '2.0' into develop-2.0-merge

2016-11-15 00:09:24 +02:00
parent 2202ec7a33 7ddb4d8e5a
commit 3c15b58891
26 changed files with 621 additions and 239 deletions
--- a/server/modules/routing/binlog/blr_master.c
+++ b/server/modules/routing/binlog/blr_master.c
@ -1230,7 +1230,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)