Merge branch '2.3' into develop

2019-04-16 11:23:49 +03:00
parent b1e7e34ed0 f8a22d0ac0
commit 3c188bf421
7 changed files with 39 additions and 10 deletions
--- a/server/modules/monitor/mariadbmon/mariadbmon.hh
+++ b/server/modules/monitor/mariadbmon/mariadbmon.hh
@ -213,6 +213,7 @@ private:
    // Cluster operations additional settings
    std::string m_replication_user;             /* Replication user for CHANGE MASTER TO-commands */
    std::string m_replication_password;         /* Replication password for CHANGE MASTER TO-commands */
+    bool        m_replication_ssl = false;      /* Set MASTER_SSL = 1 in CHANGE MASTER TO-commands */
    bool        m_handle_event_scheduler = true;/* Should failover/switchover enable/disable any scheduled
                                                 * events on the servers during promote/demote? */
    uint32_t    m_failover_timeout = 10;        /* Time limit in seconds for failover */