Merge branch '2.3' into 2.4

2020-11-11 15:04:51 +02:00 · 2020-11-11 15:04:51 +02:00 · 87cb6f76a1
commit 87cb6f76a1
parent a1a1bdf93d e685741642
1 changed files with 5 additions and 5 deletions
--- a/system-test/maxtest/src/testconnections.cc
+++ b/system-test/maxtest/src/testconnections.cc
@ -501,11 +501,6 @@ TestConnections::TestConnections(int argc, char* argv[])
        }
    }

-    if (maxscale_init)
-    {
-        init_maxscales();
-    }
-
    if (backend_ssl)
    {
        tprintf("Configuring backends for ssl \n");
@ -517,6 +512,11 @@ TestConnections::TestConnections(int argc, char* argv[])
        }
    }

+    if (maxscale_init)
+    {
+        init_maxscales();
+    }
+
    if (mdbci_call_needed)
    {
        int ec;