Merge branch '2.3' into develop

2019-01-08 13:17:27 +02:00
parent 93aff0640c 63358fb4c1
commit 49c1afcb1b
2 changed files with 8 additions and 2 deletions
--- a/server/modules/routing/readwritesplit/readwritesplit.cc
+++ b/server/modules/routing/readwritesplit/readwritesplit.cc
@ -227,6 +227,13 @@ RWSplit* RWSplit::create(SERVICE* service, MXS_CONFIG_PARAMETER* params)
        return NULL;
    }

+    if (config.master_reconnection && config.disable_sescmd_history)
+    {
+        MXS_ERROR("Both 'master_reconnection' and 'disable_sescmd_history' are enabled: "
+                  "Master reconnection cannot be done without session command history.");
+        return NULL;
+    }
+
    return new(std::nothrow) RWSplit(service, config);
 }