MXS-1886 Auto-failover error tolerance

Contains changes from commit 9e68d8ec3ddf1621f533067021c4b3042f695e80 adapted to the 2.3 branch.
2018-06-15 15:59:35 +03:00
parent 72bfc73706
commit d3e9cc9a4f
5 changed files with 63 additions and 30 deletions
--- a/server/modules/monitor/mariadbmon/mariadbserver.hh
+++ b/server/modules/monitor/mariadbmon/mariadbserver.hh
@ -298,7 +298,7 @@ public:
     * @return True if using gtid-replication. False if not, or if server is not a slave or otherwise does
     * not have a gtid_IO_Pos.
     */
-    bool uses_gtid(json_t** error_out);
+    bool uses_gtid(std::string* error_out);

    /**
     * Update replication settings, gtid:s and slave status of the server.