Merge branch '2.2' into 2.3

2018-10-31 08:53:50 +02:00
parent ce35b0d541 47e7595a08
commit 7deed35587
12 changed files with 73 additions and 167 deletions
--- a/include/maxscale/protocol/mysql.h
+++ b/include/maxscale/protocol/mysql.h
@ -43,6 +43,9 @@

 MXS_BEGIN_DECLS

+// Default version string sent to clients
+#define DEFAULT_VERSION_STRING "5.5.5-10.2.12 " MAXSCALE_VERSION "-maxscale"
+
 #define MYSQL_HEADER_LEN         4
 #define MYSQL_CHECKSUM_LEN       4
 #define MYSQL_EOF_PACKET_LEN     9