Merge branch '2.1' into develop

2017-03-09 10:02:36 +02:00
parent e1a1959bc2 41ff01d16d
commit 415001a4cd
19 changed files with 210 additions and 42 deletions
--- a/server/modules/routing/schemarouter/schemarouter.c
+++ b/server/modules/routing/schemarouter/schemarouter.c
@ -3313,11 +3313,13 @@ static rses_property_t* mysql_sescmd_get_property(mysql_sescmd_t* scmd)
 }

 /**
- * Return RCAP_TYPE_STMT_INPUT.
+ * @brief Get router capabilities
+ *
+ * @return Always  RCAP_TYPE_CONTIGUOUS_INPUT
 */
 static uint64_t getCapabilities(MXS_ROUTER* instance)
 {
-    return RCAP_TYPE_STMT_INPUT;
+    return RCAP_TYPE_CONTIGUOUS_INPUT;
 }

 /**