Merge branch '2.3' into develop

2019-02-01 13:55:54 +02:00
parent 968743f61a 08dd55a26a
commit 6038f1f386
31 changed files with 743 additions and 175 deletions
--- a/include/maxscale/protocol/mysql.hh
+++ b/include/maxscale/protocol/mysql.hh
@ -297,8 +297,11 @@ typedef enum
    MXS_COM_STMT_RESET          = 26,
    MXS_COM_SET_OPTION          = 27,
    MXS_COM_STMT_FETCH          = 28,
+    MXS_COM_DAEMON              = 29,
+    MXS_COM_UNSUPPORTED         = 30,
+    MXS_COM_RESET_CONNECTION    = 31,
    MXS_COM_STMT_BULK_EXECUTE   = 0xfa,
-    MXS_COM_DAEMON,
+    MXS_COM_MULTI               = 0xfe,
    MXS_COM_END
 } mxs_mysql_cmd_t;