Merge branch '2.2' into develop

2018-05-18 12:45:15 +03:00
parent 91cc5b1e89 3cb389a3b5
commit df7c46fbdd
6 changed files with 28 additions and 1 deletions
--- a/include/maxscale/protocol/mysql.h
+++ b/include/maxscale/protocol/mysql.h
@ -307,6 +307,7 @@ typedef enum
    MXS_COM_STMT_RESET = 26,
    MXS_COM_SET_OPTION = 27,
    MXS_COM_STMT_FETCH = 28,
+    MXS_COM_STMT_BULK_EXECUTE = 0xfa,
    MXS_COM_DAEMON,
    MXS_COM_END
 } mxs_mysql_cmd_t;