hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2018-09-12 22:14:56 +03:00
parent 12092d1a90 e1f2b81734
commit 7ec2f77708
21 changed files with 254 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
maxscale-system-test/testconnections.cpp
View File

@ -25,6 +25,7 @@ static bool manual_debug = false;
static std::string required_repl_version;
static std::string required_galera_version;
static bool restart_galera = false;
static bool multiple_maxscales = false;
}
static void signal_set(int sig, void (* handler)(int))
@ -57,6 +58,11 @@ void TestConnections::skip_maxscale_start(bool value)
maxscale::start = !value;
}
void TestConnections::multiple_maxscales(bool value)
{
maxscale::multiple_maxscales = value;
}
void TestConnections::require_repl_version(const char* version)
{
maxscale::required_repl_version = version;
@ -666,9 +672,15 @@ void TestConnections::process_template(int m, const char* template_name, const c
void TestConnections::init_maxscales()
{
for (int i = 0; i < maxscales->N; i++)
// Always initialize the first MaxScale
init_maxscale(0);
if (maxscale::multiple_maxscales)
{
init_maxscale(i);
for (int i = 1; i < maxscales->N; i++)
{
init_maxscale(i);
}
}
}