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/cache_runtime.cpp
+++ b/maxscale-system-test/cache_runtime.cpp
@ -88,7 +88,7 @@ void select(TestConnections& test, int* pValue)
            }
            while (mysql_next_result(pMysql) == 0);

-            test.expect(nRows == 1, "Unexpected number of rows: %u", nRows);
+            test.expect(nRows == 1, "Unexpected number of rows: %lu", nRows);
        }
    }
    else