Merge branch '2.1-oracle-compat' into develop-new-merge-oracle

Documentation/Changelog.md

@@ -21,6 +21,7 @@
 * MaxScale now supports IPv6
 
 For more details, please refer to:
+* [MariaDB MaxScale 2.1.4 Release Notes](Release-Notes/MaxScale-2.1.4-Release-Notes.md)
 * [MariaDB MaxScale 2.1.3 Release Notes](Release-Notes/MaxScale-2.1.3-Release-Notes.md)
 * [MariaDB MaxScale 2.1.2 Release Notes](Release-Notes/MaxScale-2.1.2-Release-Notes.md)
 * [MariaDB MaxScale 2.1.1 Release Notes](Release-Notes/MaxScale-2.1.1-Release-Notes.md)

Documentation/Getting-Started/Configuration-Guide.md

@@ -584,6 +584,43 @@ documentation for more details.
 Enable or disable the admin interface. This allows the admin interface to
 be completely disabled to prevent access to it.
 
+#### `sql_mode`
+
+Specifies whether the query classifier parser should initially expect _MariaDB_
+or _PL/SQL_ kind of SQL.
+
+The allowed values are:
+   `default`: The parser expects regular _MariaDB_ SQL.
+   `oracle` : The parser expects PL/SQL.
+
+```
+sql_mode=oracle
+```
+
+The default value is `default`.
+
+**NOTE** If `sql_mode` is set to `oracle`, then MaxScale will also assume
+that `autocommit` initially is off.
+
+At runtime, MariaDB MaxScale will recognize statements like
+```
+set sql_mode=oracle;
+```
+and
+```
+set sql_mode=default;
+```
+and change mode accordingly.
+
+**NOTE** If `set sql_mode=oracle;` is encountered, then MaxScale will also
+behave as if `autocommit` had been turned off and conversely, if
+`set sql_mode=default;` is encountered, then MaxScale will also behave
+as if `autocommit` had been turned on.
+
+Note that MariaDB MaxScale is **not** explicitly aware of the sql mode of
+the server, so the value of `sql_mode` should reflect the sql mode used
+when the server is started.
+
 ### Service
 
 A service represents the database service that MariaDB MaxScale offers to the

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

@@ -0,0 +1,65 @@
+# MariaDB MaxScale 2.1.4 Release Notes
+
+Release 2.1.4 is a GA release.
+
+This document describes the changes in release 2.1.4, when compared to
+release [2.1.3](MaxScale-2.1.3-Release-Notes.md).
+
+If you are upgrading from release 2.0, please also read the following
+release notes:
+[2.1.3](./MaxScale-2.1.3-Release-Notes.md)
+[2.1.2](./MaxScale-2.1.2-Release-Notes.md)
+[2.1.1](./MaxScale-2.1.1-Release-Notes.md)
+[2.1.0](./MaxScale-2.1.0-Release-Notes.md)
+
+For any problems you encounter, please consider submitting a bug
+report at [Jira](https://jira.mariadb.org).
+
+## Changed Features
+
+### Masking
+
+* The masking filter now has a default fill character `X`, which
+  is used if only a _value_ has been specified and the length of
+  the value does not match the length of the value received from
+  the server.
+
+  Please refer to the
+  [masking documentation](../Filters/Masking.md)
+  for details.
+
+### maxadmin
+
+* Error message for failed login attempt has been improved.
+
+## Bug fixes
+
+[Here is a list of bugs fixed since the release of MaxScale 2.1.3.](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.1.4)
+
+* [MXS-1304](https://jira.mariadb.org/browse/MXS-1304) Invalid write in gw_str_xor
+* [MXS-1299](https://jira.mariadb.org/browse/MXS-1299) CREATE TABLE LIKE fails with avrorouter
+* [MXS-1296](https://jira.mariadb.org/browse/MXS-1296) Lowercase start transaction is not detected
+* [MXS-1294](https://jira.mariadb.org/browse/MXS-1294) cdc_schema.py uses Python 3
+* [MXS-1287](https://jira.mariadb.org/browse/MXS-1287) Slaves of external servers can't be used as slaves
+* [MXS-1279](https://jira.mariadb.org/browse/MXS-1279) Runtime changes to monitor credentials expect wrong parameter names
+* [MXS-1271](https://jira.mariadb.org/browse/MXS-1271) cdc.py consuming 100% of CPU and never sending to kafka
+
+## 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 identical
+with the version of MaxScale. For instance, the tag of version X.Y.Z of MaxScale
+is X.Y.Z.
+
+The source code is available [here](https://github.com/mariadb-corporation/MaxScale).

Documentation/Upgrading/Upgrading-To-MaxScale-2.1.md

@@ -6,7 +6,8 @@ MariaDB MaxScale from version 2.0 to 2.1.
 For more information about MariaDB MaxScale 2.1, please refer to the
 [ChangeLog](../Changelog.md).
 
-For a complete list of changes in MaxScale 2.1.0, refer to the
+For a complete list of changes in MaxScale 2.1, refer to the
+[MaxScale 2.1.4 Release Notes](../Release-Notes/MaxScale-2.1.4-Release-Notes.md).
 [MaxScale 2.1.3 Release Notes](../Release-Notes/MaxScale-2.1.3-Release-Notes.md).
 [MaxScale 2.1.2 Release Notes](../Release-Notes/MaxScale-2.1.2-Release-Notes.md).
 [MaxScale 2.1.1 Release Notes](../Release-Notes/MaxScale-2.1.1-Release-Notes.md).