Merge branch '2.2' into develop

include/maxscale/filter.h

@@ -214,7 +214,7 @@ typedef struct mxs_filter_object
  * is changed these values must be updated in line with the rules in the
  * file modinfo.h.
  */
-#define MXS_FILTER_VERSION  {2, 2, 0}
+#define MXS_FILTER_VERSION  {3, 0, 0}
 
 /**
  * MXS_FILTER_DEF represents a filter definition from the configuration file.

include/maxscale/json_api.h

@@ -18,8 +18,8 @@
  * @see http://jsonapi.org/format/
  */
 
-#include <maxscale/cppdefs.hh>
-#include <maxscale/jansson.hh>
+#include <maxscale/cdefs.h>
+#include <maxscale/jansson.h>
 
 MXS_BEGIN_DECLS
 

include/maxscale/monitor.h

@@ -18,13 +18,13 @@
 
 #include <maxscale/cdefs.h>
 
-#include <mysql.h>
 #include <openssl/sha.h>
 
 #include <maxscale/config.h>
 #include <maxscale/dcb.h>
 #include <maxscale/server.h>
 #include <maxscale/jansson.h>
+#include <maxscale/protocol/mysql.h>
 
 MXS_BEGIN_DECLS
 
@@ -95,7 +95,7 @@ typedef struct mxs_monitor_object
  * The monitor API version number. Any change to the monitor module API
  * must change these versions using the rules defined in modinfo.h
  */
-#define MXS_MONITOR_VERSION {3, 0, 0}
+#define MXS_MONITOR_VERSION {3, 1, 0}
 
 /**
  * Specifies capabilities specific for monitor.
@@ -382,6 +382,19 @@ void load_server_journal(MXS_MONITOR *monitor, MXS_MONITORED_SERVER **master);
  * @param search_server Server to search for
  * @return Found monitored server or NULL if not found
  */
-MXS_MONITORED_SERVER* mon_get_monitored_server(MXS_MONITOR* mon, SERVER* search_server);
+MXS_MONITORED_SERVER* mon_get_monitored_server(const MXS_MONITOR* mon, SERVER* search_server);
+
+/**
+ * Get an array of monitored servers. All the servers defined in the config setting must be monitored by
+ * the given monitor.
+ *
+ * @param params Config parameters
+ * @param key Setting name
+ * @param mon Monitor which should monitor the servers
+ * @param monitored_servers_out Where to save output. The caller should free the array, but not the elements.
+ * @return Output array size if successful, negative value otherwise
+ */
+int mon_config_get_servers(const MXS_CONFIG_PARAMETER* params, const char* key, const MXS_MONITOR* mon,
+                           MXS_MONITORED_SERVER*** monitored_array_out);
 
 MXS_END_DECLS

include/maxscale/mysql_utils.h

@@ -15,7 +15,7 @@
 #include <maxscale/cdefs.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include <mysql.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/server.h>
 
 MXS_BEGIN_DECLS
@@ -124,4 +124,19 @@ mxs_mysql_name_kind_t mxs_mysql_name_to_pcre(char *pcre,
  */
 void mxs_mysql_set_server_version(MYSQL* mysql, SERVER* server);
 
+/**
+ * Enable/disable the logging of all SQL statements MaxScale sends to
+ * the servers.
+ *
+ * @param enable If true, enable, if false, disable.
+ */
+void mxs_mysql_set_log_statements(bool enable);
+
+/**
+ * Returns whether SQL statements sent to the servers are logged or not.
+ *
+ * @return True, if statements are logged, false otherwise.
+ */
+bool mxs_mysql_get_log_statements();
+
 MXS_END_DECLS

include/maxscale/query_classifier.h

@@ -17,7 +17,7 @@
 
 MXS_BEGIN_DECLS
 
-#define QUERY_CLASSIFIER_VERSION {1, 1, 0}
+#define MXS_QUERY_CLASSIFIER_VERSION {2, 0, 0}
 
 /**
  * qc_init_kind_t specifies what kind of initialization should be performed.

include/maxscale/router.h

@@ -218,7 +218,7 @@ typedef struct mxs_router_object
  * must update these versions numbers in accordance with the rules in
  * modinfo.h.
  */
-#define MXS_ROUTER_VERSION  { 2, 0, 0 }
+#define MXS_ROUTER_VERSION  { 3, 0, 0 }
 
 /**
  * Specifies capabilities specific for routers. Common capabilities