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-07-04 22:01:01 +03:00
parent 44ef4912e8 1aa5dcf659
commit 2e88ce4132
10 changed files with 40 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@ namespace maxscale
{
static bool start = true;
static bool check_nodes = true;
static bool manual_debug = false;
static std::string required_repl_version;
static std::string required_galera_version;
}
@ -158,6 +159,7 @@ TestConnections::TestConnections(int argc, char *argv[]):
case 's':
printf("Maxscale won't be started\n");
maxscale::start = false;
maxscale::manual_debug = true;
break;
case 'i':
@ -644,7 +646,7 @@ void TestConnections::init_maxscale(int m)
{
const char * template_name = get_template_name(test_name);
if (maxscale::start)
if (!maxscale::manual_debug)
{
stop_maxscale(m);
}