Merge branch 'develop' into MXS-1075

2017-03-27 08:38:07 +02:00
parent 9388dff7cf 710012ac5d
commit 72c2a3ca18
216 changed files with 6588 additions and 5421 deletions
--- a/server/modules/routing/binlogrouter/blr.c
+++ b/server/modules/routing/binlogrouter/blr.c
@ -173,6 +173,8 @@ MXS_MODULE* MXS_CREATE_MODULE()
        MXS_ROUTER_VERSION,
        "Binlogrouter",
        "V2.1.0",
+        RCAP_TYPE_NO_RSESSION | RCAP_TYPE_CONTIGUOUS_OUTPUT |
+        RCAP_TYPE_RESULTSET_OUTPUT | RCAP_TYPE_NO_AUTH,
        &MyObject,
        NULL, /* Process init. */
        NULL, /* Process finish. */
@ -1942,7 +1944,7 @@ static void rses_end_locked_router_action(ROUTER_SLAVE *rses)

 static uint64_t getCapabilities(MXS_ROUTER* instance)
 {
-    return RCAP_TYPE_NO_RSESSION | RCAP_TYPE_CONTIGUOUS_OUTPUT | RCAP_TYPE_RESULTSET_OUTPUT;
+    return RCAP_TYPE_NONE;
 }

 /**