Merge branch '2.4' into 2.4.14

2020-11-19 13:54:11 +02:00
parent 56575882d7 5fc73646a4
commit 5906f59344
6 changed files with 31 additions and 23 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,