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

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Johan Wikman
2019-03-21 09:26:06 +02:00
parent 09ae5d741c 65b4ac7c1b
commit 2ba7e63e7e
18 changed files with 583 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -816,11 +816,16 @@ void TestConnections::copy_one_mariadb_log(int i, std::string filename)
for (auto cmd : log_retrive_commands)
{
std::ofstream outfile(filename + std::to_string(j++));
auto output = repl->ssh_output(cmd, i).second;
if (outfile)
if (!output.empty())
{
outfile << repl->ssh_output(cmd, i).second;
std::ofstream outfile(filename + std::to_string(j++));
if (outfile)
{
outfile << output;
}
}
}
}