Merge branch '2.1' into develop

2017-08-03 15:51:15 +03:00
parent ae5eb004fe f7b8744460
commit 1f4856cdc5
11 changed files with 88 additions and 47 deletions
--- a/include/maxscale/monitor.h
+++ b/include/maxscale/monitor.h
@ -286,6 +286,13 @@ void mon_process_state_changes(MXS_MONITOR *monitor, const char *script, uint64_
 */
 void mon_hangup_failed_servers(MXS_MONITOR *monitor);

+/**
+ * @brief Report query errors
+ *
+ * @param db Database where the query failed
+ */
+void mon_report_query_error(MXS_MONITOR_SERVERS* db);
+
 /**
 * @brief Convert monitor to JSON
 *