Merge branch '2.0' into develop

Documentation/About/Limitations.md

@@ -237,6 +237,12 @@ and routed. Here is a list of the current limitations.
   the query will be routed to the first available server. This possibly
   returns an error about database rights instead of a missing database.
 
+* The preparation of a prepared statement is routed to all servers. The
+  execution of a prepared statement is routed to the first available server or
+  to the server pointed by a routing hint attached to the query. As text
+  protocol prepared statements are relatively rare, prepared statements can't be
+  considered as supported in schemarouter
+
 ## Avrorouter limitations (avrorouter)
 
 The avrorouter does not support the following data types and conversions.

Documentation/Changelog.md

@@ -11,6 +11,7 @@
   as JSON objects (beta level functionality).
 
 For more details, please refer to:
+* [MariaDB MaxScale 2.0.4 Release Notes](Release-Notes/MaxScale-2.0.4-Release-Notes.md)
 * [MariaDB MaxScale 2.0.3 Release Notes](Release-Notes/MaxScale-2.0.3-Release-Notes.md)
 * [MariaDB MaxScale 2.0.2 Release Notes](Release-Notes/MaxScale-2.0.2-Release-Notes.md)
 * [MariaDB MaxScale 2.0.1 Release Notes](Release-Notes/MaxScale-2.0.1-Release-Notes.md)

Documentation/Filters/Database-Firewall-Filter.md

@@ -35,7 +35,21 @@ configuration directory is _/etc/maxscale.modules.d_.
 
 #### `action`
 
-This parameter is optional and determines what action is taken when a query matches a rule. The value can be either `allow`, which allows all matching queries to proceed but blocks those that don't match, or `block`, which blocks all matching queries, or `ignore` which allows all queries to proceed.
+This parameter is optional and determines what action is taken when a query
+matches a rule. The value can be either `allow`, which allows all matching
+queries to proceed but blocks those that don't match, or `block`, which blocks
+all matching queries, or `ignore` which allows all queries to proceed.
+
+The following statement types will always be allowed through when `action` is
+set to `allow`:
+
+ - COM_QUIT: Client closes connection
+ - COM_PING: Server is pinged
+ - COM_CHANGE_USER: The user is changed for an active connection
+ - COM_SET_OPTION: Client multi-statements are being configured
+ - COM_FIELD_LIST: Alias for the `SHOW TABLES;` query
+ - COM_PROCESS_KILL: Alias for `KILL <id>;` query
+ - COM_PROCESS_INFO: Alias for `SHOW PROCESSLIST;`
 
 You can have both blacklist and whitelist functionality by configuring one filter
 with `action=allow` and another one with `action=block`. You can then use

Documentation/Release-Notes/MaxScale-2.0.4-Release-Notes.md

@@ -0,0 +1,57 @@
+# MariaDB MaxScale 2.0.4 Release Notes
+
+Release 2.0.4 is a GA release.
+
+This document describes the changes in release 2.0.4, when compared to
+release [2.0.3](MaxScale-2.0.3-Release-Notes.md).
+
+If you are upgrading from release 1.4, please also read the release
+notes of release [2.0.3](./MaxScale-2.0.3-Release-Notes.md),
+release [2.0.2](./MaxScale-2.0.2-Release-Notes.md),
+release [2.0.1](./MaxScale-2.0.1-Release-Notes.md) and
+[2.0.0](./MaxScale-2.0.0-Release-Notes.md).
+
+For any problems you encounter, please submit a bug report at
+[Jira](https://jira.mariadb.org).
+
+## Changed Features
+
+- The dbfwfilter now rejects all prepared statements instead of ignoring
+  them. This affects _wildcard_, _columns_, _on_queries_ and _no_where_clause_
+  type rules which previously ignored prepared statements.
+
+- The dbfwfilter now allows COM_PING and other commands though when
+  `action=allow`. See [../Filters/Database-Firewall-Filter.md](documentation)
+  for more details.
+
+- The MariaDB Connector-C was upgraded to a preliminary release of version 2.3.3 (fixes MXS-951).
+
+## Bug fixes
+
+[Here](https://jira.mariadb.org/issues/?jql=project%20%3D%20MXS%20AND%20issuetype%20%3D%20Bug%20AND%20status%20%3D%20Closed%20AND%20fixVersion%20%3D%202.0.4)
+is a list of bugs fixed since the release of MaxScale 2.0.3.
+
+* [MXS-1111](https://jira.mariadb.org/browse/MXS-1111): Request Ping not allowed
+* [MXS-1082](https://jira.mariadb.org/browse/MXS-1082): Block prepared statements
+* [MXS-1080](https://jira.mariadb.org/browse/MXS-1080): Readwritesplit (documentation of max_slave_replication_lag)
+* [MXS-951](https://jira.mariadb.org/browse/MXS-951): Using utf8mb4 on galera hosts stops maxscale connections
+
+## Known Issues and Limitations
+
+There are some limitations and known issues within this version of MaxScale.
+For more information, please refer to the [Limitations](../About/Limitations.md) document.
+
+## Packaging
+
+RPM and Debian packages are provided for the Linux distributions supported
+by MariaDB Enterprise.
+
+Packages can be downloaded [here](https://mariadb.com/resources/downloads).
+
+## Source Code
+
+The source code of MaxScale is tagged at GitHub with a tag, which is derived
+from the version of MaxScale. For instance, the tag of version `X.Y.Z` of MaxScale
+is `maxscale-X.Y.Z`.
+
+The source code is available [here](https://github.com/mariadb-corporation/MaxScale).

Documentation/Routers/ReadWriteSplit.md

@@ -32,6 +32,9 @@ This feature is disabled by default.
 This applies to Master/Slave replication with MySQL monitor and `detect_replication_lag=1` options set.
 Please note max_slave_replication_lag must be greater than monitor interval.
 
+This option only affects Master-Slave clusters. Galera clusters do not have a
+concept of slave lag even if the application of write sets might have lag.
+
 
 ### `use_sql_variables_in`