Merge branch '2.1' into 2.2

2017-09-25 12:32:27 +03:00
parent 61f3ba3efa 8d136d7979
commit 551bfb6f26
16 changed files with 194 additions and 13 deletions
--- a/Documentation/Routers/ReadWriteSplit.md
+++ b/Documentation/Routers/ReadWriteSplit.md
@ -237,6 +237,15 @@ multi-statement queries.
 router_options=strict_multi_stmt=false
 ```

+### `strict_sp_calls`
+
+Similar to `strict_multi_stmt`, this option allows all queries after a CALL
+operation on a stored procedure to be routed to the master. This option is
+disabled by default and was added in MaxScale 2.1.9.
+
+All warnings and restrictions that apply to `strict_multi_stmt` also apply to
+`strict_sp_calls`.
+
 ### `master_failure_mode`

 This option controls how the failure of a master server is handled. By default,