Merge branch '2.3' into 2.4
This commit is contained in:
@ -501,11 +501,6 @@ TestConnections::TestConnections(int argc, char* argv[])
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (maxscale_init)
|
|
||||||
{
|
|
||||||
init_maxscales();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (backend_ssl)
|
if (backend_ssl)
|
||||||
{
|
{
|
||||||
tprintf("Configuring backends for ssl \n");
|
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)
|
if (mdbci_call_needed)
|
||||||
{
|
{
|
||||||
int ec;
|
int ec;
|
||||||
|
|||||||
Reference in New Issue
Block a user