Merge branch '2.1' into develop

2017-08-14 10:36:34 +03:00
parent 9d3772a67e 7021041804
commit 4798810f76
11 changed files with 181 additions and 146 deletions
--- a/server/modules/routing/binlogrouter/blr.h
+++ b/server/modules/routing/binlogrouter/blr.h
@ -731,6 +731,7 @@ typedef struct router_instance
    uint32_t          mariadb10_gtid_domain;/*< MariaDB 10 GTID Domain ID */
    sqlite3           *gtid_maps;           /*< MariaDB 10 GTID storage */
    enum binlog_storage_type   storage_type;/*< Enables hierachical binlog file storage */
+    char              *set_slave_hostname;  /*< Send custom Hostname to Master */
    struct router_instance  *next;
 } ROUTER_INSTANCE;