Merge branch '2.2' into develop

2018-04-23 14:05:52 +03:00
parent ac7d1198fb d67320e06a
commit f4bdf3012d
59 changed files with 172 additions and 235 deletions
--- a/maxscale-system-test/cache_runtime_ttl.cpp
+++ b/maxscale-system-test/cache_runtime_ttl.cpp
@ -145,9 +145,6 @@ void init(TestConnections& test)
 void run(TestConnections& test)
 {
    init(test);
-
-    MYSQL* pMysql = test.maxscales->conn_rwsplit[0];
-
    int value;

    // Let's set a long hard_ttl so that it will not interfere