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/mariadbserver.cc
+++ b/server/modules/monitor/mariadbmon/mariadbserver.cc
@ -2088,6 +2088,10 @@ string MariaDBServer::generate_change_master_cmd(GeneralOpData& op, const SlaveS
                                slave_conn.name.c_str(),
                                slave_conn.master_host.c_str(), slave_conn.master_port);
    change_cmd += "MASTER_USE_GTID = current_pos, ";
+    if (op.replication_ssl)
+    {
+        change_cmd += "MASTER_SSL = 1, ";
+    }
    change_cmd += string_printf("MASTER_USER = '%s', ", op.replication_user.c_str());
    const char MASTER_PW[] = "MASTER_PASSWORD = '%s';";
 #if defined (SS_DEBUG)