Merge branch '2.3' into develop

2018-12-18 00:00:00 +02:00
parent 405b4de1dd 35d31801bb
commit 5a9e84d39a
12 changed files with 88 additions and 19 deletions
--- a/server/core/modutil.cc
+++ b/server/core/modutil.cc
@ -1367,6 +1367,7 @@ namespace maxscale
 std::string get_canonical(GWBUF* querybuf)
 {
    std::string rval;
+    rval.reserve(gwbuf_length(querybuf) - MYSQL_HEADER_LEN + 1);
    mxs::Buffer buf(querybuf);

    enum state