Merge branch '2.1' into develop

2017-05-17 13:48:31 +03:00
parent 3b8bda289e 4050cd20d8
commit 322983a5f4
36 changed files with 645 additions and 245 deletions
--- a/include/maxscale/modutil.h
+++ b/include/maxscale/modutil.h
@ -103,4 +103,7 @@ bool is_mysql_statement_end(const char* start, int len);
 bool is_mysql_sp_end(const char* start, int len);
 char* modutil_get_canonical(GWBUF* querybuf);

+// TODO: Move modutil out of the core
+const char* STRPACKETTYPE(int p);
+
 MXS_END_DECLS