Merge branch '2.1' into develop

2017-04-05 11:34:59 +03:00
parent 1fb8cde5d8 e0a98f6539
commit ad1c05b015
51 changed files with 1133 additions and 450 deletions
--- a/include/maxscale/protocol/mysql.h
+++ b/include/maxscale/protocol/mysql.h
@ -74,6 +74,7 @@ MXS_BEGIN_DECLS
 #define MYSQL_CHECKSUM_LEN 4
 #define MYSQL_EOF_PACKET_LEN 9
 #define MYSQL_OK_PACKET_MIN_LEN 11
+#define MYSQL_ERR_PACKET_MIN_LEN 9

 /**
 * Offsets and sizes of various parts of the client packet. If the offset is