Merge branch '2.3' into develop

2019-06-19 17:26:40 +03:00
parent 0ff065c4eb 39df829384
commit 5528a8e8fb
4 changed files with 10 additions and 6 deletions
--- a/server/modules/monitor/mariadbmon/mariadbserver.hh
+++ b/server/modules/monitor/mariadbmon/mariadbserver.hh
@ -384,10 +384,12 @@ public:
    /**
     * Demote this server. Removes all slave connections. If server was master, sets read_only.
     *
-     * @param op Cluster operation descriptor
+     * @param general General operation data
+     * @param demotion Demotion-specific settings
+     * @param type Which specific operation is this part of
     * @return True if successful
     */
-    bool demote(GeneralOpData& general, ServerOperation& op);
+    bool demote(GeneralOpData& general, ServerOperation& demotion, OperationType type);

    /**
     * Redirect the slave connection going to old master to replicate from new master.