Merge branch '2.3' into 2.4

2020-08-14 15:12:48 +03:00
parent 1bcc73666a b31cb20bae
commit eaac7881f0
10 changed files with 10 additions and 10 deletions
--- a/system-test/mxs1929_start_from_scratch.cpp
+++ b/system-test/mxs1929_start_from_scratch.cpp
@ -120,7 +120,7 @@ int main(int argc, char** argv)

    auto end = std::chrono::steady_clock::now();

-    test.tprintf("A total of %d connections were created over %d seconds",
+    test.tprintf("A total of %d connections were created over %ld seconds",
                 conns.load(),
                 std::chrono::duration_cast<std::chrono::seconds>(end - start).count());