Merge branch '2.3' into 2.4

2020-11-17 10:54:58 +02:00
parent fa0b9d8df1 f577d09829
commit 10582a02fe
5 changed files with 19 additions and 17 deletions
--- a/include/maxscale/protocol/mysql.hh
+++ b/include/maxscale/protocol/mysql.hh
@ -270,6 +270,9 @@ typedef enum
 #define MXS_MARIA_CAP_COM_MULTI            (1 << 1)
 #define MXS_MARIA_CAP_STMT_BULK_OPERATIONS (1 << 2)

+// Only bulk operations are supported
+#define MXS_MARIADB_CAP_SERVER MXS_MARIA_CAP_STMT_BULK_OPERATIONS
+
 typedef enum
 {
    MXS_COM_SLEEP = 0,