Merge branch '2.2' into develop

2018-04-24 13:57:50 +03:00
parent ce98831908 2a38902aa6
commit caa964fa57
6 changed files with 69 additions and 22 deletions
--- a/server/modules/monitor/mariadbmon/mariadbserver.hh
+++ b/server/modules/monitor/mariadbmon/mariadbserver.hh
@ -266,7 +266,8 @@ public:
    bool failover_wait_relay_log(int seconds_remaining, json_t** err_out);

    /**
-     * Read the file contents and send them as sql queries to the server. Queries should not return any data.
+     * Read the file contents and send them as sql queries to the server. Any data returned by the queries is
+     * discarded.
     *
     * @param server Server to send queries to
     * @param path Text file path.