Merge branch '2.2' into develop

2018-09-13 13:08:25 +03:00
parent 7ec2f77708 b3d6e49061
commit 8c561c6e55
13 changed files with 34 additions and 51 deletions
--- a/maxscale-system-test/blob_test.cpp
+++ b/maxscale-system-test/blob_test.cpp
@ -193,7 +193,7 @@ int check_longblob_data(TestConnections* Test,
        {
            if ((int)data[y] != y)
            {
-                Test->add_result(1, "expected %d, got %d", data[y], y);
+                Test->add_result(1, "expected %lu, got %d", data[y], y);
                break;
            }
        }