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/server_utils.hh
+++ b/server/modules/monitor/mariadbmon/server_utils.hh
@ -223,6 +223,7 @@ enum class OperationType
 {
    SWITCHOVER,
    FAILOVER,
+    REJOIN,
    UNDO_DEMOTION // Performed when switchover fails in its first stages.
 };